libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-21 06:52:46 +01:00
Code Issues Projects Releases Wiki Activity
2843 commits 207 branches 105 tags 123 MiB
Commit graph

515 commits

Author SHA1 Message Date
0ip
b28afe4c47 Adjust border-color of #sidediv 2012-11-13 12:42:52 +01:00
0ip
c2253e49b6 Add ability to set language via URL parameter 2012-11-12 18:31:02 +01:00
Marcel Klehr
993d501943 Make L10n.js requireable 2012-11-12 17:42:07 +01:00
Marcel Klehr
7021a8b885 Add pad setting for UI lang 2012-11-12 16:49:15 +01:00
Marcel Klehr
a3504f70c4 Add i18n component 2012-11-10 14:12:17 +01:00
Mike Brousseau
34594eb88b Update src/static/js/pad.js 
Check if the browser is IE and if so output the entire path via document.location over document.location.pathname to the cookie creation in createCookie()
 2012-11-08 13:47:21 -05:00
John McLear
7febd3ff5c Resolve #583 
This kinda resolves the issue but not in a very graceful way.  It means any numbered items > 99 will still be cropped.

The problem is due to no padding/margin and then needing to specify margin.

you can replicate this bug with

```
<body style="padding:0; margin:0">
<style type="text/css">
li:nth-child(n+10){
  margin-left:1.6em;
}
</style>
<ol style="list-style-type: decimal;margin-left:1.5em;padding:0;">
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>




</ol>
</body>
```
 2012-11-06 12:37:35 +00:00
John McLear
f68bdde0c1 resolve #1131 make textarea resize 2012-11-06 11:56:19 +00:00
John McLear
b6a331b9ec Merge pull request #1120 from Pita/feature/settings-admin 
Modify Server Settings in /admin/settings
 2012-11-05 04:48:59 -08:00
Peter 'Pita' Martischka
6408581adb merged develop back in 2012-11-03 18:16:36 +00:00
johnyma22
2f123970e6 Make express restart - I think this reloads settings 2012-11-02 15:21:12 +00:00
johnyma22
1d055f2cd4 make stuff work 2012-11-02 15:15:13 +00:00
johnyma22
7fa5dd757e remove cruft from js and move minify json to seperate file and also send emit back to server on save settings 2012-11-02 15:05:47 +00:00
johnyma22
f6fa897a4e actually using text area is a lot less stupid 2012-11-02 14:31:52 +00:00
Chia-liang Kao
4827cdbd96 fix imported ol that were turned into ul 2012-11-02 21:39:40 +08:00
johnyma22
89e38ed4c2 Start putting file system together for admin settings, no where near complete 2012-11-02 13:16:15 +00:00
johnyma22
d929877865 JS fix for #1077 fire event at start because of the resize issue, this is a clean way of doing it 2012-10-30 22:35:01 +00:00
johnyma22
d30bb6d892 fixes a tiny css bug #1077 2012-10-30 21:57:15 +00:00
johnyma22
14ef06c699 Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests 2012-10-30 17:22:08 +00:00
John McLear
b2446fa61f Merge pull request #1098 from Pita/span-two-lines-on-less-than-400px 
make anything less than 400px span 2 lines on toolbar and make popups ap...
 2012-10-29 15:00:11 -07:00
johnyma22
898331b680 fix rtl sanity 2012-10-29 21:55:57 +00:00
johnyma22
4f85bf09cc make anything less than 400px span 2 lines on toolbar and make popups appear below this 2012-10-29 19:20:02 +00:00
Peter 'Pita' Martischka
0420b89382 Merge pull request #1097 from Pita/develop 
Pull in Develop branch so we can test latest develop
 2012-10-29 07:25:34 -07:00
John McLear
b4680e42d7 add a keystroke check for chat and make it so the chat listens on event 13 aswell as event 10 2012-10-28 17:38:56 +00:00
Marcel Klehr
78e64ffea8 Mimic, replace or work around removed npm utils. 2012-10-28 18:34:20 +01:00
Peter 'Pita' Martischka
f59b643aa6 Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests 2012-10-27 16:32:37 +01:00
Chia-liang Kao
8199bf8377 Do not assume window object exists 2012-10-23 15:21:05 +08:00
John McLear
429651874f Merge pull request #1072 from marcelklehr/fix/timeslider-links-regexp 
Fix #1067 Corrected exports links regexp
 2012-10-16 13:36:20 -07:00
Marcel Klehr
6c89187f95 Fix #1067 Corrected exports links regexp 2012-10-16 20:46:27 +02:00
NAGOYA, Yoshihiko
957a0aa873 fix Pita/etherpad-lite #1032 
refact inInternationalComposition
 2012-10-12 01:12:15 +09:00
johnyma22
5c54b2c681 attempt to move onClick away from HTML.. This is required 2012-10-04 21:16:58 +01:00
John McLear
a1280fd917 Merge pull request #1004 from yourcelf/develop 
Add `userColor` query param to set initial color
 2012-10-04 10:57:16 -07:00
John McLear
56453409a5 Update src/static/js/pad_editbar.js 
Somehow </iframe> was no more.  Now it is back..  Oh boy.
 2012-10-02 02:19:44 +02:00
Chad Weider
622819ba93 Make intialization of Ace2Inner analogous to other page controllers. 2012-09-21 22:09:55 -07:00
Chad Weider
9f5946c942 Reformat Ace2Editor frame boot scripts. 2012-09-21 22:09:55 -07:00
Chad Weider
fa65f889ec Consolidate Ace2Editor frame's boot script. 2012-09-21 22:09:55 -07:00
John McLear
923b51033b List 12 plugins instead of 4 
4 was a bit stingy :)  12 is a bit more friendly from a UX persepctive.
 2012-09-18 15:54:08 +02:00
Charlie DeTar
53113644a0 Require userColor to be valid css hex 
The utility functions colorutils.js assume that background colors are in
CSS hex format, so require userColor to do the same, rather than
allowing inputs like "red" and "rgba(...)", to insure that inversion
checks will succeed.
 2012-09-17 10:59:12 -04:00
Charlie DeTar
bc6e495e8c Use 'transparent' as reference to validate css 
Use 'transparent' instead of 'white' as a reference color for validating
CSS color values.  Presumably, a user setting a userColor wants some
color other than 'transparent' if they are setting it (they could always
duplicate the background's color if not).
 2012-09-17 00:19:57 -04:00
Chad Weider
a0177e5d3c Remember, the class symbol is reserved in some environments. 
Fixes issue introduced in 9be69ef258.
 2012-09-16 18:07:55 -07:00
Charlie DeTar
afc90604bf Add userColor query param to set initial color 
Add a URL parameter which sets the initial color for a user, e.g.:

    http://example.com/p/mypad?userColor=%2300ff00

Sanitize the given color value to ensure that it's a valid css value
(could be any supported CSS color format -- #fff, rgba(), "red", etc).

Shortly after rejoining a pad, the server responds with a USER_NEWINFO
message which may contain an old color value; however, this message
arrives after we have set and sent the new color value to the server.
To avoid this race condition, if the query parameter has been set,
ignore the color value in a USER_NEWINFO message which matches our user
ID.
 2012-09-15 17:48:04 -04:00
John McLear
e9e3ea305b Merge pull request #992 from gedion/develop 
Added hooks and made some ace functions available to editorInfo Object
 2012-09-14 04:51:17 -07:00
John McLear
ba8177fc6f Merge pull request #999 from lepidum/develop 
Fixed international composition issues (e.g., Japanese Input method)
 2012-09-14 04:50:08 -07:00
NAGOYA, Yoshihiko
71c9444694 fix for InternationalComposition(e.g., Japanese Input) 
moved inInternationalComposition from Ace2Inner to top window
fix bindTheEventHandlers() because ie9 implement CompositionEvent
when inInternationalComposition, NEW_CHANGES msg and ACCEPT_COMMIT msg
are pushed msgQueue.
when handleUserChanges(), apply msgQueue.
 2012-09-13 23:37:26 +09:00
Chad Weider
b691606c4e Replace ParentRequire hack. 
Instead of hacking with the internals of require, make client_plugins aware
and capable of sharing behavior.
 2012-09-11 21:16:47 -07:00
Chad Weider
1258ed3a0d Split client and server plugin functionality. 
There is virtually no shared code for the client, extract it into its own
module and do away with the switches.
 2012-09-11 21:16:47 -07:00
Chad Weider
9394495364 Inject plugins into hooks. 2012-09-11 21:16:47 -07:00
Chad Weider
3631f0ece3 Inject special normalization behavior. 2012-09-11 21:16:47 -07:00
Chad Weider
e375b6212a Static functions are static. 2012-09-11 21:16:47 -07:00
Chad Weider
b0d71df604 Fix worthless indentation. 2012-09-11 21:16:47 -07:00
Gedion
a25feed1c2 fixed indentation 2012-09-11 17:49:58 -05:00
Gedion
3364eb131e fixed comments 2012-09-11 17:02:53 -05:00
Gedion
9be69ef258 fixed plugins 2012-09-11 16:21:14 -05:00
Chad Weider
03bcd07741 Use packaged version of Tinycon. 2012-09-09 18:18:59 -07:00
Chad Weider
1541237654 Use packaged version of UNorm. 2012-09-09 18:18:59 -07:00
Chad Weider
19a7208c97 Clean up requires. 2012-09-09 18:18:59 -07:00
Chad Weider
0da4acfdb5 Use packaged edition of async. 2012-09-09 18:18:59 -07:00
Chad Weider
8e735b0841 Use packaged edition of underscore. 2012-09-09 18:18:59 -07:00
Chad Weider
b47f6ae905 Use packaged edition of security module. 2012-09-09 18:18:59 -07:00
John McLear
32b4729305 Merge pull request #987 from cweider/loopback-avoidance 
Windows server fixes
 2012-09-09 15:50:42 -07:00
Chad Weider
3b5ea88bf5 If the file was not found this should be nothing. 2012-09-09 14:42:32 -07:00
Chad Weider
3312387b08 Drop embedding of modules. 
With loopback removed, embedding concatenated resources doesn't happen. It
was a marginal feature to begin with so it will not be missed.
 2012-09-09 14:40:20 -07:00
Gedion
c37c48cd12 added hooks and made some functions available to editor info object in ace 2012-09-08 13:45:33 -05:00
Gedion
6d1cba2259 added hooks to contentcollector.js 2012-09-08 12:11:04 -05:00
Gedion
a2c8d21240 added hooks to contentcollector.js 2012-09-08 12:03:13 -05:00
John McLear
453b6473a0 Merge pull request #984 from lepidum/develop 
Fixed ESC key handling issue of Firefox 15
 2012-09-07 06:23:57 -07:00
John McLear
c5be2eb418 Merge pull request #977 from cweider/loopback-avoidance 
Loopback avoidance
 2012-09-03 14:56:55 -07:00
Chad Weider
6e796eb5fb Make exception case for require kernel obvious. 2012-09-03 14:41:26 -07:00
NAGOYA, Yoshihiko
55cf1cabb5 fix prevent ESC key patch 2012-08-30 13:24:35 +09:00
NAGOYA, Yoshihiko
521e76ae44 prevent ESC key 2012-08-30 12:00:27 +09:00
Wikinaut
85f5eb38e4 fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled 2012-08-16 01:00:36 +02:00
Daniel Perez Alvarez
699aa299f8 Normalize inserted text using UNorm 
For some reason, the client was sending the server a Unicode-normalized
version of inserted strings. So if for example we inserted the string
'ä' (i.e. \x61\xCC\x88) into the document, what would be sent to the
server would be 'ä' (i.e. \xC3\xA4).

This wouldn't be a problem on its own. BUT JavaScript reports that the
length of the first string is 2, while the length of the second one is
1.

So the command that was being sent to the server was 'Z:1>2*0+1$ä', when
it should really be 'Z:1>1*0+1$ä'. When the `checkRep` method checks the
length of the inserted string, it finds an inconsistency, and
disconnects the client.

We now normalize the inserted string before the command is generated, so
the length is always correct.
 2012-08-13 17:09:02 +01:00
Daniel Perez Alvarez
48f1545777 Add Unicode normalization library 2012-08-13 17:06:25 +01:00
Mark Holmquist
44878bc0a3 Add in a plugin hook "handleClientMessage_<MSG_NAME>" 
The new hook will accept only the message named in the hook call.
It will be used primarily for adding new message handlers, but it
can alse be used to handle existing message types.
 2012-08-10 09:51:18 -07:00
0ip
c9bdd1196d Merge pull request #872 from marcelklehr/feature/connectivity-toolbar 
Nice popups instead of modals
 2012-08-01 11:37:15 -07:00
Wikinaut
11e601fbcd fix #890 test if console is available before writing to console.log 2012-08-01 14:34:03 +02:00
odony
a2bf577393 Fix #769 - wonky bug with pasted lists 
After 6507614e459dac868d3c76355ca013d13132bc79 the contentcollector does not properly "exit" lists back to the `none` listType anymore.
The repro steps on #769 seem to pass correctly after this change.
 2012-07-25 13:45:53 +02:00
Marcel Klehr
9d25dcc1f9 Merge branch 'develop' into feature/connectivity-toolbar 
Conflicts:
	src/templates/pad.html
 2012-07-23 11:26:15 +02:00
Marcel Klehr
9aed433ad5 Fix #880 Remove call to padsavedrevs.handleIsFullyConnected 2012-07-18 15:54:53 +02:00
Mark Holmquist
9bd23acb3d Add userJoinOrUpdate hook 
This hook fires on the client side, whenever a user joins or
updates (hence the name). It will pass one thing, the user's info,
into the context. This is mostly just for notification purposes.
 2012-07-17 10:12:10 -07:00
Marcel Klehr
eb6be84150 Fix html/css 2012-07-15 16:03:12 +02:00
Marcel Klehr
4901adeac7 Fix timeslider. 2012-07-14 15:54:44 +02:00
Marcel Klehr
1466fa03a4 Fix some minor mistakes. 2012-07-14 15:54:20 +02:00
Marcel Klehr
2d0cf156af Fix showModal animation. 
New content shouldn' slide in before the containing popup.
 2012-07-14 15:14:46 +02:00
Marcel Klehr
4220d6bedd Put loading git back in. 2012-07-14 15:12:21 +02:00
Marcel Klehr
8ab12ee69e Only disable toolbar. 
Make content available and allow scrolling
 2012-07-14 14:46:02 +02:00
Marcel Klehr
6bda1f8e4d Fix padeditbar.toggleDropDown 
Only call callback, if one was passed.
 2012-07-13 09:13:22 +02:00
Marcel Klehr
9e9cbd5ffa Fix typo. 2012-07-13 08:24:02 +02:00
Marcel Klehr
6da6a7f0d8 Use nice editbar popups for connection status instead of srceen-blocking modals. 2012-07-13 08:23:22 +02:00
Marcel Klehr
dc9eda9364 Use Tinycon to display chat mentions in favicon. 2012-07-12 20:18:33 +02:00
Marcel Klehr
f12cb0dd58 Don't screw up, if chat is empty. 2012-07-12 10:34:11 +02:00
Marcel Klehr
8a471e590a Fix #581 Don't scroll chat automatically if user is not at the bottom 2012-07-11 22:30:03 +02:00
John McLear
6726ea6632 option to stop autoscroll 2012-07-11 17:42:59 +01:00
Matthias Bartelmeß
3a0015c357 remove unused _opt in favor of code size/readability 2012-07-08 11:51:04 +02:00
Matthias Bartelmeß
9ff3aa0ee0 make /static/tests.html functional again, 
added getLastEdited
 2012-07-07 20:41:26 +02:00
Egil Moeller
799a5768c7 Quick hack to hide ep_etherpad-lite in plugin list 2012-07-05 18:13:29 +02:00
Egil Moeller
a0548af021 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into restartserver 2012-07-03 23:32:37 +02:00
Egil Moeller
b438a278a1 Make the server restart on plugin install 2012-07-03 23:31:44 +02:00
Marcel Klehr
227477967f Fix plugin loader 
make it work on client side and with relative paths
 2012-06-29 12:40:16 +02:00
Marcel Klehr
b0d369883b Fix plugin loader to work with windows paths (e.g. 'D:\foo\...') 2012-06-28 15:58:28 +02:00
John McLear
e4ff4021ab Merge pull request #810 from redhog/aceEditEvent 
Plugin/hook features&bugfixes
 2012-06-22 03:53:50 -07:00
Egil Moeller
476cfc8da0 Merge branch 'master' into aceEditEvent 2012-06-22 12:12:15 +02:00
John McLear
0483802841 resolve issue #384 and also clear chat counter whenever focus is on chat input. Just a slightly nicer chat experience 2012-06-12 22:52:22 +02:00
Egil Moeller
3338db9485 Bugfixes 2012-06-05 13:32:33 +02:00
Egil Moeller
cf2f0b72a3 More plugin information 2012-06-04 14:33:38 +02:00
John McLear
dc678a458f Merge pull request #746 from redhog/timeslider-realtimeupdate+readonly-pads 
Timeslider realtimeupdate+readonly pads
 2012-05-30 11:07:25 -07:00
Egil Moeller
27f25b8c61 Added hook to catch edit events 2012-05-30 17:18:43 +02:00
Egil Moeller
357ca73a99 Bugfix for bug introduced by 96ab3dc3b4: jQuery is packaged - this is pure duplication. 2012-05-30 10:00:36 +02:00
Egil Moeller
15a7d24450 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads 
Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html
 2012-05-29 21:26:12 +02:00
John McLear
dfd81b79d4 Merge pull request #738 from cweider/packaging 
Packaging
 2012-05-28 17:08:23 -07:00
Chad Weider
819fb76dcd These definitions are meaningless. 2012-05-28 16:43:20 -07:00
Chad Weider
a28bbd0b3f Definition will not have an effect if already defined - force redefinition. 2012-05-28 16:43:20 -07:00
Chad Weider
774e2a1517 Fix indentation. 2012-05-28 16:43:20 -07:00
John McLear
95b9cf4f62 Merge pull request #737 from cweider/packaging 
Packaging
 2012-05-28 15:28:50 -07:00
Chad Weider
96ab3dc3b4 jQuery is packaged - this is pure duplication. 2012-05-28 15:14:52 -07:00
Chad Weider
c4c30bf725 Correct parent_require path. 2012-05-28 15:14:51 -07:00
Chad Weider
299a90b3ba Fix paths for ace files. 2012-05-28 15:14:51 -07:00
Chad Weider
9def552d3c Remove trailing comma added in e661f653b1. Fixes #733. 2012-05-28 14:40:08 -07:00
0ip
d4b4ca0a5c Center user icon and fix overlapping chat 2012-05-23 20:40:24 +03:00
0ip
185a3bface Add def. bg to <select> and remove useless style 2012-05-20 20:19:16 +03:00
0ip
fe0ea23299 Fix userlist now showing up 2012-05-20 16:02:51 +02:00
0ip
caa56dd32a Add non-floating popups 2012-05-20 15:59:51 +02:00
0ip
19cf43d0a3 Style select (useful for plugins) 2012-05-20 15:38:12 +02:00
0ip
750b9d44df Style selected text 2012-05-20 15:37:03 +02:00
0ip
fbee7dabcf Add grouped buttons 2012-05-20 15:29:10 +02:00
0ip
afe060e2b8 Remove even more old code 2012-05-20 14:53:30 +02:00
0ip
0d68cd23ba Remove old CSS code 2012-05-20 14:48:02 +02:00
John McLear
fbc2cb32b3 Merge pull request #705 from johnyma22/removeWordle 
Remove wordle
 2012-05-19 05:58:38 -07:00
John McLear
53bfc380af Merge pull request #703 from cweider/remove-onclick 
Remove onclick
 2012-05-19 05:41:49 -07:00
Egil Moeller
fc946ffc33 Hide editing buttons when in readonly mode 2012-05-17 12:03:38 +02:00
Chad Weider
a9eb2d4e31 Fix ordering of editer code loading operations. 2012-05-14 19:01:00 -07:00
Chad Weider
384523859e Require ace2_common separately. 2012-05-14 18:20:16 -07:00
Chad Weider
97c7842d19 Remove unused line. 2012-05-14 18:20:16 -07:00
Chad Weider
9942c577dc Patch tablet styling. 2012-05-13 15:33:22 -07:00
Chad Weider
5d0c853889 Remove unnecessary styles. 2012-05-13 15:33:22 -07:00
Chad Weider
f802a79da6 Make styles less restrictive. 2012-05-13 15:33:22 -07:00
Chad Weider
818c3ef40d Shift button appearance onto anchor. 2012-05-13 15:33:22 -07:00
Chad Weider
089e0227fd Shift editbar styles around. 2012-05-13 15:33:22 -07:00
Chad Weider
1ea889bfab Anchors are not icons 2012-05-13 15:33:22 -07:00
Chad Weider
ab8b2cae21 Remove nonsense styles. 2012-05-13 15:33:22 -07:00
Chad Weider
dc0fb12b09 Remove onclick attributes from editbar. 2012-05-13 15:33:22 -07:00
John McLear
def904dbed remove wordle 2012-05-13 20:20:18 +01:00
John McLear
c70d88eedc Merge pull request #667 from fourplusone/feature/cleaner_code 
Removing unused code - All looks good, some minor tweeks are probably worthwhile  in the future.
 2012-05-13 06:51:58 -07:00
0ip
64db697558 Fixed typos 2012-04-30 16:54:19 +02:00
0ip
7a09d97731 Fix #683 - Disabling authorship colors doesn't work 2012-04-30 17:40:29 +03:00
0ip
23cdb2a5c6 Removed QR-Code 2012-04-30 15:54:21 +02:00
0ip
96eb8ac004 100% is not needed here http://ragefac.es/416 2012-04-29 21:19:34 +03:00
John McLear
bf568b3477 Merge pull request #682 from fourplusone/fix/fix-677 
fixed plugins.js
 2012-04-29 11:13:45 -07:00
Matthias Bartelmeß
fa622857b9 fixed plugins.js 2012-04-29 20:12:15 +02:00
John McLear
122986798e Merge pull request #681 from fourplusone/fix/fix-677 
fixed socket.io in timeslider.js
 2012-04-29 11:11:25 -07:00
Matthias Bartelmeß
cbb5a043b8 fixed socket.io in timeslider.js 2012-04-29 20:04:00 +02:00
John McLear
a73192b10d Merge pull request #680 from fourplusone/fix/fix-677 
Fix #677
 2012-04-29 10:57:35 -07:00
Matthias Bartelmeß
0e941b498e fix #677 2012-04-29 19:54:38 +02:00
0ip
2525f20ff4 Tidied up highlighting for currently opened module 2 2012-04-29 02:48:47 +02:00
0ip
4b272fe2e1 Tidied up highlighting for currently opened module 2012-04-29 01:00:31 +02:00
Egil Moeller
c173ebe197 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads 2012-04-25 17:51:03 +02:00
Matthias Bartelmeß
513deef768 added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670 2012-04-25 10:23:58 +02:00
Egil Moeller
e559ef5640 Disable design mode in readonly pad 2012-04-23 16:41:41 +02:00
Egil Moeller
ba3430ebb7 Corect ReadOnly link 2012-04-23 16:20:55 +02:00
Egil Moeller
ed7e254417 Disconnect handling and cleanup of unused code 2012-04-23 14:47:07 +02:00
Egil Moeller
e5a22423bb Fixed timedelta problem 2012-04-23 14:20:17 +02:00
Egil Moeller
1faae5b756 Timeslider autoupdate on pad change 2012-04-23 13:29:27 +02:00
Egil Moeller
914d79ad20 Unified timeslider and pad editing protocol / component 2012-04-23 12:52:30 +02:00
Matthias Bartelmeß
18d0c81181 adding padutils to padmodals 2012-04-21 14:57:22 +02:00
Matthias Bartelmeß
a557f2414e cssManager top is not used, so drop it 2012-04-21 13:47:11 +02:00
Matthias Bartelmeß
9d9b7b7b47 Merge branch 'develop' into feature/cleaner_code 2012-04-21 00:34:32 +02:00
John McLear
a5210ab27d Merge pull request #647 from etinquis/fixes 
Fix + New Hook
 2012-04-20 15:10:40 -07:00
John McLear
0a9fcc267f Merge pull request #658 from redhog/master 
Bugfixes for when plugins are installed as dependencies for other plugins
 2012-04-20 05:56:57 -07:00
Egil Moeller
72c972b256 Bugfix for recursive dependency-installation and paths 2012-04-20 14:37:53 +02:00
Matthias Bartelmeß
89ab73c868 removing commented out functions from cssmanager.js 2012-04-20 14:25:07 +02:00
Matthias Bartelmeß
8593b1905c getRepHTML seems to be unused. Removing 2012-04-20 14:24:44 +02:00
Matthias Bartelmeß
709a3b1dbe removing debug code in collab_client.js 2012-04-20 13:34:35 +02:00
Matthias Bartelmeß
ab7f7506b9 removed unused functions in collab_client 2012-04-20 13:32:43 +02:00
Matthias Bartelmeß
07ee836946 set view zoom is unused 2012-04-20 12:19:09 +02:00
Matthias Bartelmeß
e661f653b1 sharebox and Feedback are not used. Removing them 2012-04-20 12:15:09 +02:00
Matthias Bartelmeß
23bbe4ab5a undo-xpopup seems to be unused 2012-04-20 12:04:10 +02:00
Matthias Bartelmeß
f809b0d6c8 removing de-facto noop 2012-04-20 12:03:11 +02:00
0ip
a743112170 Fix #626, Plugins don't work if pad is on a subdir 2012-04-19 19:44:44 +03:00
John McLear
4a7ab12859 Merge pull request #649 from rassie/patch-1 
Corrected color picker: `jQuery(...).css('background-color')` returns…
 2012-04-19 08:37:09 -07:00
John McLear
9fe8a7530d Merge pull request #641 from 0ip/highlight_module 
Fix | Highlight currently opened module
 2012-04-19 08:23:51 -07:00
0ip
ef88d2798e Restore overwritten plugin manager UI 2012-04-19 17:00:29 +02:00
Egil Moeller
7b39da2d69 Bugfix for callFirst to actually call call hooks until it finds one that returns non-empty, which is actually usefull, as opposed to just calling one hook. 2012-04-19 16:03:42 +02:00
Nikolai Prokoschenko
576fe06682 Corrected color picker: jQuery(...).css('background-color') returns a hex notation in IE8 and rgb() in every other browser. 2012-04-19 16:44:19 +03:00
Martyn York
da75b87d3c added new hook 'acePostWriteDomLineHTML' which gets called after a domline is created and has been added to the page. Also fixed problems with ReferenceExceptions due to require-kernel not being sent to the iframe. 2012-04-18 14:44:25 -07:00
Egil Moeller
4c1d94343f Better plugin admin interface 2012-04-18 13:43:34 +02:00
Egil Moeller
d6f476312d Spelling bugfixes 2012-04-18 10:16:41 +02:00
Egil Moeller
7ab7ee9f5e Plugin admin fixes 2012-04-17 22:40:53 +02:00
Egil Moeller
6f774bc6a5 Separated out the code for the plugin manager 2012-04-17 22:40:46 +02:00
Egil Moeller
f80f9fc59f Merge commit 'd5120c9' into pita 2012-04-17 22:34:45 +02:00
Egil Moeller
3a62c6d2ab Bugfix for this being wrong in editorInfo.ace_performDocumentApplyAttributesToRange 2012-04-17 22:32:46 +02:00
0ip
d75aeeaf8f pad_editbar adapated hacky highlighting of currently opened module to recent changes 2012-04-16 15:23:19 +02:00
John McLear
7cf4510bf5 Merge pull request #637 from fourplusone/feature/timeslider_cleanup 
Feature/timeslider cleanup
 2012-04-15 12:11:46 -07:00
Matthias Bartelmeß
e664320b8c removed sliderEnabled, supportsSlider clientVars, as they were not used anywhere 2012-04-15 19:25:23 +02:00
Matthias Bartelmeß
d834c42ffc avoid missing anon. timeslider authors 2012-04-15 19:18:29 +02:00
Jordan Hollinger
06f36664b8 Fix re-enabling line numbers. issue #618 2012-04-13 17:21:07 -04:00
0ip
8fa54e2402 admin interface styling and sensibility 2012-04-11 19:44:18 +02:00
Chad Weider
e695c716e5 Work around strange order of execution bug in Firefox. Fixes #620 2012-04-11 02:08:50 -07:00
0ip
50c79df272 prefixed css files containing css3 attributes due to recently removed prefixfree.js 2012-04-09 17:52:43 +02:00
0ip
77936c6c12 removed a weird plus 2012-04-09 18:42:09 +03:00
John McLear
f9d8cea114 Merge pull request #612 from levu42/bug-user-scroll 
Userlists now scrolls if there are too many users
 2012-04-09 06:37:03 -07:00
0ip
c3095bbd1b improved userlist ux (prevent overlapping of objects) 2012-04-09 15:16:40 +02:00
Matthias Bartelmeß
c3ce00a82d added a comment on skiplist.js 2012-04-08 21:21:52 +02:00
Matthias Bartelmeß
2406800cd6 documentation on AttributeManager 2012-04-08 21:21:05 +02:00
levu
9e063341ce fix for bug 'userlist not scrolling' 2012-04-08 16:22:00 +02:00
Matthias Bartelmeß
62c9b1c25e Merge branch 'fix/list-removal' into ace2_refactoring 2012-04-07 10:26:21 +02:00
Matthias Bartelmeß
8be1deda6f Merge branch 'develop' into fix/list-removal 2012-04-07 03:42:16 +02:00
Matthias Bartelmeß
18dc111010 Fixing bug where lists get deleted when pressing enter 2012-04-07 03:42:05 +02:00
Matthias Bartelmeß
1e8e071693 Merge commit '57e137f65bd5152c0c2dc8508c796674d3289545' into ace2_refactoring 2012-04-07 02:14:43 +02:00
Matthias Bartelmeß
2db74150ee linestylefilter now uses attributemanager to find lineattributemarkers 2012-04-07 02:14:19 +02:00
Matthias Bartelmeß
a0235126e4 syntax candy 2012-04-07 02:13:26 +02:00
Matthias Bartelmeß
6507614e45 made domline and content collector lineAttributes compatible 2012-04-07 02:12:42 +02:00
John McLear
57e137f65b Merge pull request #599 from fourplusone/ace2_refactoring 
ACE2 refactoring
 2012-04-06 17:07:49 -07:00
Matthias Bartelmeß
9efe838a32 removed unused variable 2012-04-07 01:57:10 +02:00
Matthias Bartelmeß
c79593569a added aceEditorCSS hook 2012-04-07 01:40:13 +02:00
Matthias Bartelmeß
34f07efcfb Delete key removes line attributes if prev line is not emtpy 2012-04-07 01:07:25 +02:00
Matthias Bartelmeß
38276e636c postAceInit passes ace instance 2012-04-07 01:06:29 +02:00
Matthias Bartelmeß
0340c87996 Pad message handler detects lineattributemakers by asking Attribute manager 2012-04-07 01:05:25 +02:00
Matthias Bartelmeß
7418f08dc7 Added 2 new Hooks 
+ aceInitialized is called when ace has been fully initialized
+ aceRegisterBlockElements allows to register new Block Elements with ace.
 2012-04-07 01:02:50 +02:00
0ip
ae21eb30dd Deselect highlighted editbar module button when userlist is opened 2012-04-06 22:32:19 +03:00
Matthias Bartelmeß
81f14fa157 Merge branch 'develop' into ace2_refactoring 2012-04-06 17:49:16 +02:00
Matthias Bartelmeß
39d0b149a9 corrected documentation on Attribute Manager 2012-04-06 17:44:34 +02:00
John McLear
7766f8aaad Merge pull request #591 from fourplusone/timeslider_authors 
Timeslider authors
 2012-04-05 16:38:55 -07:00
Matthias Bartelmeß
d61cdf57cc Merge branch 'develop' into ace2_refactoring 2012-04-05 22:28:16 +02:00
Matthias Bartelmeß
9b1536ac10 fixing 'rep is not defined' error 2012-04-05 22:26:39 +02:00
Matthias Bartelmeß
151f1a0d71 Merge branch 'develop' into timeslider_authors 2012-04-05 21:54:26 +02:00
Matthias Bartelmeß
404ce9e452 css fixes 2012-04-05 21:53:04 +02:00
Matthias Bartelmeß
9e042ee942 Merge branch 'develop' into timeslider_authors 
Conflicts:
	src/static/css/pad.css
	src/templates/timeslider.html
 2012-04-05 21:47:59 +02:00
Egil Moeller
a3c9407ed6 Merge branch 'develop' of git://github.com/Pita/etherpad-lite 2012-04-05 20:14:48 +02:00
johnyma22
d5120c98d0 very quick admin interface styling and sensibility 2012-04-05 18:22:53 +01:00
johnyma22
66fdacf9cf move css out of html 2012-04-05 18:04:17 +01:00
Matthias Bartelmeß
ff9e407092 Minor coding style improvement. Does the same as before 2012-04-05 15:26:51 +02:00
Matthias Bartelmeß
2ccc70daf6 documented lineAndColumnFromChar 2012-04-05 15:25:17 +02:00
Matthias Bartelmeß
5833cb1037 renamed performDocumentApplyAttributesToRange to setAttributesOnRange and moved it to AttributeManager 2012-04-05 15:22:22 +02:00
Matthias Bartelmeß
093b7ab4bf added lineMarkerAttribute + more comments 2012-04-05 15:20:48 +02:00
Egil Moeller
8cd1298a16 Added init hook to install plugin database default content and the like 2012-04-05 01:48:12 +02:00
Matthias Bartelmeß
9f02972af4 remove debugger statement 2012-04-05 01:08:01 +02:00
Matthias Bartelmeß
60942b09a4 fixing lineHasMarker 2012-04-05 01:07:47 +02:00
Matthias Bartelmeß
23cda77b65 added AttributeManager, ChangesetUtils 2012-04-05 00:50:04 +02:00
Matthias Bartelmeß
6c647baa02 Merge branch 'fix/client_plugins' into ace2_refactoring 2012-04-04 15:13:07 +02:00
Matthias Bartelmeß
4acbb11fd5 Merge branch 'develop' into feature/implicit_hooks 2012-04-04 15:04:10 +02:00
Matthias Bartelmeß
5115f74f66 use hook name as function name, if not specified 
Example `"[hookName]": "ep_plugin/static/js/index:[hookName]"` becomes  `"[hookName]": "ep_plugin/static/js/index"`
 2012-04-04 15:03:28 +02:00
Matthias Bartelmeß
5a77979486 make jshint happy 2012-04-04 09:51:46 +02:00
Matthias Bartelmeß
b2173a1084 get rid of node.extend (since duplicated by underscorejs) 2012-04-04 09:40:18 +02:00
Matthias Bartelmeß
2dd60b0b6d Merge branch 'develop' into ace2_refactoring 2012-04-03 19:30:57 +02:00
Sofian Benaissa
c55f54b972 Fix the nocolor embed parameter 2012-04-02 16:35:18 -04:00
John McLear
9ecd864ac6 Merge pull request #557 from redhog/master 
Templating system built on top of EJS and plugin installer
 2012-04-02 12:42:38 -07:00
Egil Moeller
434252a321 Removed prefixfree as it breaks @import in css files 2012-04-01 22:55:04 +02:00
Egil Moeller
ba00144bcd Button styling bugfix 2012-04-01 15:20:51 +02:00
Egil Moeller
47c4f46237 Moved star image to right directory 2012-04-01 14:52:16 +02:00
Egil Moeller
08cc3e128f Bugfix for timeslider styling 2012-04-01 14:33:39 +02:00