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-22 15:26:14 +01:00
Code Issues Projects Releases Wiki Activity
4368 commits 206 branches 105 tags 124 MiB
Commit graph

1022 commits

Author SHA1 Message Date
John McLear
275592e423 seems right 2015-02-11 02:07:20 +00:00
John McLear
0ad09c17db fix JS error in timeslider if offset doesn't exist 2015-02-09 23:04:30 +00:00
John McLear
26ae375727 minor css polish for user input 2015-02-09 19:53:32 +00:00
John McLear
b216f9271b should be final logic for chatandusers 2015-02-09 19:11:35 +00:00
John McLear
5245d2b797 and even mroe polish 2015-02-09 18:36:11 +00:00
John McLear
8c6507e78c more styling stuff 2015-02-09 18:01:45 +00:00
John McLear
4af46921e1 better css 2015-02-09 17:37:20 +00:00
John McLear
7adcd5cba4 cleaner fix for queue issue 2015-02-08 14:34:48 +00:00
John McLear
1652ed42c5 fix scroll issue where focus is not well managed 
remove console logs
 2015-02-07 23:26:02 +00:00
John McLear
35da64be5c hrm bit of a hack, anyone any ideas on better way? 2015-01-28 19:09:47 +00:00
John McLear
0216a10a12 better variable name 2015-01-27 20:10:38 +00:00
John McLear
bdfce1cbef change to cc.. 2015-01-27 19:41:01 +00:00
John McLear
8fbd7d83b6 content collector should also register the blocks, no idea why this wasnt in before 2015-01-27 19:16:36 +00:00
John McLear
c4f1189ebd even cleaner 2015-01-26 02:39:43 +00:00
John McLear
18121a1507 much cleaner 2015-01-26 02:32:58 +00:00
John McLear
8156930208 clean support for image hook 2015-01-26 01:44:40 +00:00
John McLear
aca745ddf6 tell installer if old etherpad needs updating during plugin install 2015-01-25 02:44:10 +00:00
John McLear
f3e5682a0f fix issue with load of showuserandchat 2015-01-24 18:31:19 +00:00
John McLear
3f08bf7405 Merge pull request #2490 from Gared/https_plugins_json 
Use https to download plugins.json
 2015-01-24 13:34:41 +00:00
Stefan
da86110f58 Use https to download plugins.json 2015-01-24 12:55:17 +01:00
Stefan
713b369fc3 Add 'last update' column to plugins table 2015-01-24 12:49:17 +01:00
John McLear
5dce72d419 chrome list handling fix for #2412 2015-01-23 01:47:12 +00:00
John McLear
036dea3d0f styling 2015-01-21 17:25:06 +00:00
John McLear
657974b518 move saved revs notification to gritter 2015-01-21 16:40:44 +00:00
John McLear
753e8fdf0b working logic 2015-01-21 16:08:54 +00:00
John McLear
17fa87552d styling 2015-01-21 15:48:21 +00:00
John McLear
941cc3c24b url param 2015-01-21 15:37:55 +00:00
John McLear
920ec9c553 Merge pull request #2467 from ether/chat-and-users 
Show users and Chat at the same time
 2015-01-21 15:22:23 +00:00
John McLear
3cd8759cec expose modernIE value 2015-01-21 15:21:31 +00:00
John McLear
3fd6e72657 try again 2015-01-21 15:06:29 +00:00
John McLear
a2cb8a2f19 rename back to browser 2015-01-21 15:01:39 +00:00
John McLear
f2891e3b8b working 2015-01-21 14:55:29 +00:00
John McLear
ce40cacafa mheh looks fixed 2015-01-21 14:49:06 +00:00
John McLear
990e14c904 working with a big hack 2015-01-21 14:25:24 +00:00
John McLear
34d6b31c98 some sanity 2015-01-21 13:24:21 +00:00
John McLear
eacf1118f8 blind attempt to try 2015-01-21 02:55:03 +00:00
John McLear
c315defc31 temp bodge fix 2015-01-19 15:15:52 +00:00
John McLear
ab71bc7c20 hrm 2015-01-19 14:45:49 +00:00
John McLear
edbeb66d5e Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-19 14:33:17 +00:00
John McLear
44d1d6cc13 fix ie editing 2015-01-19 14:32:58 +00:00
Cetra Free
f1c9c58c2d Update to timeslider to include base path for easier proxying 2015-01-19 14:28:30 +10:30
Cetra Free
3649118194 Update to timeslider to include base path for easier proxying 2015-01-19 14:25:06 +10:30
John McLear
13eff60dfe mheh I suck at css 0ip would do a way better job of this 2015-01-19 02:13:34 +00:00
John McLear
63c65f784b semi working example 2015-01-19 01:45:49 +00:00
John McLear
33c62329ba better regexp for line items 2015-01-19 00:28:32 +00:00
John McLear
0bd7914c3b dont paste on middle click of link 2015-01-18 23:58:47 +00:00
John McLear
7e69bc65ce remove infinite load was causing pain 2015-01-18 23:03:54 +00:00
John McLear
ca6b729ace fix for ep page view pageup/down 2015-01-18 19:58:38 +00:00
John McLear
83fae22279 allow list text entry up to 16 items 2015-01-18 15:32:48 +00:00
Stefan
3c6db077ed Change domain for plugins.json request 2015-01-18 14:22:27 +01:00
Stefan
4644073399 Prevent dublicates in search results 2015-01-18 13:56:30 +01:00
Stefan
6d6ddd7f9f Prevent form submit on plugin page 2015-01-18 12:15:41 +01:00
Stefan
a080b12eac Add new favicon (32x32) with associated svg file 2015-01-11 22:40:56 +01:00
Marcel Klehr
167e0aea59 Merge pull request #2442 from ether/fix/attribmanager-removeattribonline 
Finally fix AttribManager#removeAttributeOnLine
 2015-01-10 16:35:37 +01:00
webzwo0i
82efcdb430 fix for uls without class 2015-01-09 02:04:03 +01:00
Marcel Klehr
751adb24fd Finally fix AttribManager#removeAttributeOnLine 
return safely if the attribute wasn't found.
fixes #2394
 2015-01-05 18:38:34 +01:00
John McLear
c0078abc75 Merge branch 'develop' of github.com:ether/etherpad-lite into fix/reimplement-ace-getAttributeOnSelection 2015-01-05 17:15:38 +00:00
John McLear
230302b132 fix timeslider stars and frontend tests, needs css polish 2015-01-01 22:40:45 +00:00
Marcel Klehr
1451eecaf0 Re-implement ace_getAttributeOnSelection 2014-12-31 19:23:09 +01:00
John McLear
8eb723b906 patch for e1c683be3f 2014-12-31 14:16:10 +00:00
John McLear
036b7d2890 Merge pull request #2418 from ether/etherpad-export-and-import 
Full Pad portability (Export/Import)
 2014-12-31 13:32:09 +00:00
John McLear
b5c671a9b6 Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs 
Clean-up after removing list attribute: Remove list numbering attribute
 2014-12-31 13:19:24 +00:00
John McLear
335bf3dc4a more line polish 2014-12-31 01:46:53 +00:00
Marcel Klehr
cfe75c7f3f Clean-up after removing list attribute: Remove list numbering attribute 2014-12-30 17:45:26 +01:00
Stefan
c20a7e9bce Merge pull request #2406 from Gared/fix/author-not-set-callback 
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
 2014-12-30 14:55:49 +01:00
Stefan
5df638bfac Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected 
Notify user if cookies can't be created
 2014-12-30 14:54:43 +01:00
John McLear
19c78212e8 Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished 
Fix lineassembler not finished
 2014-12-30 12:19:04 +01:00
John McLear
a07d1722fc no errors on chrome client 2014-12-30 12:12:24 +01:00
John McLear
a2262c56b9 msg for user 2014-12-29 22:05:14 +01:00
John McLear
3773b6346b semi working requires browser refresh 2014-12-29 20:57:58 +01:00
webzwo0i
e1c683be3f differentiate between indents and bullets in unordered lists 2014-12-29 16:12:07 +01:00
John McLear
321d550d43 second fix for user list issue on #2413 2014-12-29 01:20:28 +01:00
John McLear
23570e80a7 unbind before rebind, partial fix towards #2413 issue 2014-12-29 01:17:24 +01:00
John McLear
248d7655d7 Merge pull request #2401 from ether/save-prefs 
set prefs and get prefs
 2014-12-29 01:01:09 +01:00
John McLear
6b1fee400d Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest 2014-12-29 00:40:07 +01:00
Gared
018821e98c Use camel case 2014-12-28 22:20:09 +01:00
John McLear
74eca43965 Merge pull request #2014 from eyesonlyhack/closeExtendedChatWindow 
Close extended chat window
 2014-12-28 20:17:30 +01:00
Gared
2307c6fbda Notify user if cookies can't be created 2014-12-28 15:02:56 +01:00
John McLear
68f50ff9fa Merge pull request #2409 from ether/fix-removeAttribOnLine 
AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left
 2014-12-28 12:52:39 +01:00
Marcel Klehr
362315c638 AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left 2014-12-28 12:34:42 +01:00
John McLear
dd09f6144b Merge pull request #2398 from ether/indentLevels 
Indent levels
 2014-12-27 23:27:11 +01:00
John McLear
c276343216 timeslider fixes 2014-12-27 22:31:23 +01:00
Gared
9cf19b99fe Fix missing callback of #2400 and ignore missing author on timeslider on client-side 2014-12-27 22:25:24 +01:00
John McLear
b1f29b914c minor ts bg fix 2014-12-27 22:05:35 +01:00
webzwo0i
3354b9406b op is ok, if it doesnt include newlines. op is ok, if op.lines is equal to newlines in op.chars 2014-12-27 19:30:02 +01:00
webzwo0i
51c14d9947 check if op.lines is in sync with atext-newlines 
Conflicts:
	src/static/js/Changeset.js
 2014-12-27 19:28:56 +01:00
webzwo0i
251a75346d make stringIterator aware of newlines 2014-12-27 19:25:14 +01:00
John McLear
036df30c0e Merge pull request #2402 from ether/fix-attribmanager-removeLineAttrib 
Fix removeAttributeOnLine: Only remove a single attrib
 2014-12-27 19:23:49 +01:00
John McLear
7df944b3fd Merge pull request #2404 from webzwo0i/sanity-in-atext 
block changeset if it deletes more lines than exist in the whole pad
 2014-12-27 18:36:13 +01:00
webzwo0i
07a6702363 Revert "be more strict in checkRep" 
This reverts commit 22803da42f.
 2014-12-27 17:56:20 +01:00
Marcel Klehr
a63880dcb1 Fix AttributeManager#removeAttributeOnLine: Only remove a single attrib 2014-12-27 16:15:20 +01:00
John McLear
a151c207c2 set prefs and get prefs 2014-12-27 15:08:54 +01:00
John McLear
ae22332f71 removing dokuwiki 2014-12-27 14:08:45 +01:00
John McLear
9d66a446dc support indentation up to 16 levels and dont go back afterwards 2014-12-27 13:18:58 +01:00
John McLear
10d92b6bf1 slightly better attribute selection logic but still pretty b0rked 2014-12-26 23:42:00 +00:00
John McLear
88ab74b1e9 fix flowing of items in editbar 2014-12-24 17:54:13 +00:00
John McLear
b71fb3ad20 fix issue with attributes 2014-12-23 02:38:50 +00:00
John McLear
3fe58068c0 more fixes 2014-12-21 23:16:00 +00:00
John McLear
12aac2d0d0 Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles 2014-12-21 23:12:59 +00:00
John McLear
745ef5db1c fix timeslider socket issue 2014-12-21 23:10:56 +00:00
John McLear
a2d22a5764 Merge pull request #2377 from webzwo0i/avoid-global-vairables 
declare var outside of loop
 2014-12-16 16:18:01 +00:00
webzwo0i
0263d30b37 declare var outside of loop 2014-12-16 17:00:35 +01:00
John McLear
cfa3f15f94 Merge pull request #2373 from webzwo0i/avoid-global-vairables 
dont make local variables global
 2014-12-16 00:41:41 +00:00
webzwo0i
5d15f655f0 dont make local variables global 2014-12-14 22:01:28 +01:00
John McLear
a2dbf8761f allow for timeslider custom messages 2014-12-10 01:23:24 +00:00
Simon Gaeremynck
45c1ad078b Allow for shardable Etherpad 2014-12-09 14:59:18 +00:00
John McLear
653cc6c87f this class was in before, it is used to show when a style is applied to a piece of content 2014-12-09 14:57:18 +00:00
John McLear
f11bdc1b44 also logic to add attributes for properties 2014-12-09 01:31:40 +00:00
John McLear
6080de9d79 Merge pull request #2348 from ether/sanitizer 
sanitizer change
 2014-12-04 17:31:42 +00:00
webzwo0i
22803da42f be more strict in checkRep 2014-12-04 16:12:13 +01:00
webzwo0i
10c2f72720 dont remove more lines than exist in the whole text 2014-12-04 16:01:39 +01:00
John McLear
c1fdd7ff79 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-12-01 15:10:17 +00:00
John McLear
c539cc7d6b styling of global view colum 2014-12-01 15:10:03 +00:00
John McLear
d7e980cd47 yet more minor css polish 2014-11-29 02:24:19 +00:00
John McLear
ed96c13a1f minor ui polish 2014-11-29 00:54:06 +00:00
John McLear
ee585f0457 color picker on mobile actually shows on screen 2014-11-29 00:32:37 +00:00
John McLear
34f7625739 a little more polish 2014-11-29 00:30:13 +00:00
John McLear
53887db872 mobile ui polish 2014-11-29 00:26:25 +00:00
John McLear
a642deaa72 gritter css fix 2014-11-28 02:25:21 +00:00
John McLear
68979e1212 better fix 2014-11-28 00:35:46 +00:00
John McLear
e6d85bbe69 fix issue with top of chatbox not being aligned properly 2014-11-28 00:26:34 +00:00
John McLear
d974e881a8 Merge branch 'develop' of github.com:ether/etherpad-lite into sanitizer 2014-11-28 00:02:16 +00:00
John McLear
3ca48ed975 fix undo in chrome etc 2014-11-27 16:49:08 +00:00
John McLear
2c728b8e1b sanitizer change 2014-11-27 00:45:22 +00:00
John McLear
e51ab2db24 fix for #2132 2014-11-26 23:37:44 +00:00
John McLear
60d44cd3df use cheerio instead of jsdom 2014-11-25 17:26:09 +00:00
John McLear
555d22245d Merge pull request #2335 from ether/javascript-bower 
swap out jquery browser for bower but expose browser object to all pages...
 2014-11-23 14:15:41 +00:00
John McLear
0eb7cc7864 Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admin-etc 2014-11-23 14:14:11 +00:00
John McLear
5f2e830b72 whoopsi 2014-11-22 19:13:23 +00:00
John McLear
9b66c93d6b swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well 2014-11-22 19:11:35 +00:00
John McLear
488d6890f9 minor styling 2014-11-21 00:15:55 +00:00
John McLear
ff9a2a687f whoops fix animation not to look broken 2014-11-19 18:27:55 +00:00
John McLear
28c7b666c1 correct file links 2014-11-19 00:24:14 +00:00
John McLear
16d8068d7d Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons 2014-11-19 00:17:01 +00:00
John McLear
9aea689438 move tiny bit of font awesome we actually use into pad.css 2014-11-19 00:16:08 +00:00
John McLear
f5dcc374ba slight ui fix 2014-11-18 23:15:56 +00:00
John McLear
e821cb13fa more polish 2014-11-18 22:47:20 +00:00
John McLear
95cb721914 clean up 2014-11-18 22:41:00 +00:00
John McLear
09b08e5a72 working pause 2014-11-18 22:29:46 +00:00
John McLear
e2410e41b0 more polish 2014-11-18 22:24:16 +00:00
John McLear
a06f01c04a some timeslider styling but this wont be completed by me 2014-11-18 22:21:36 +00:00
Beau Gunderson
645ec830b0 Don't crash on bad plugins.json; fixes #2323 2014-11-18 13:59:36 -08:00
John McLear
4a12eec3e0 a font lookup file 2014-11-18 21:10:40 +00:00
John McLear
9712f852e9 remove connecting bar image 2014-11-18 19:16:50 +00:00
John McLear
9b5ee93bce spinning loading icons 2014-11-18 19:13:51 +00:00
John McLear
3ad9a58895 fontello config file 2014-11-18 18:47:12 +00:00
John McLear
21ce9b4dd3 correct font stuff 2014-11-18 18:44:45 +00:00
John McLear
c14e1696b3 remove stuff, new files 2014-11-18 18:09:29 +00:00
John McLear
d10013c159 client side code now fixed 2014-11-18 14:10:38 +00:00
John McLear
020b636b1f template of a semi-fix 2014-11-18 14:08:44 +00:00