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
3875 commits 207 branches 105 tags 123 MiB
Commit graph

698 commits

Author SHA1 Message Date
Marcel Klehr
362315c638 AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left 2014-12-28 12:34:42 +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
ae22332f71 removing dokuwiki 2014-12-27 14:08:45 +01: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
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
ed96c13a1f minor ui polish 2014-11-29 00:54:06 +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
16d8068d7d Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons 2014-11-19 00:17:01 +00:00
John McLear
f5dcc374ba slight ui fix 2014-11-18 23:15:56 +00:00
John McLear
e2410e41b0 more polish 2014-11-18 22:24:16 +00:00
Beau Gunderson
645ec830b0 Don't crash on bad plugins.json; fixes #2323 2014-11-18 13:59:36 -08:00
John McLear
9712f852e9 remove connecting bar image 2014-11-18 19:16:50 +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
Simon Gaeremynck
d7a181be67 Nooping console.foo in html10n.js when the method is not defined. 2014-11-15 16:31:19 +00:00
John McLear
fc79c8a298 Merge pull request #1912 from ether/hide-chat-when-caret-behind 
Hide Chat Icon when the Caret is on the same line
 2014-11-15 16:13:53 +00:00
John McLear
eff4863a22 Merge pull request #2290 from ether/IE11-null-password 
change to proper IE check
 2014-11-15 15:37:53 +00:00
John McLear
12914e68ff Merge pull request #2294 from ether/go-away-npm 
Use request and a remote ep plugin only endpoint
 2014-11-15 15:37:44 +00:00
John McLear
8d2fa35b3f Merge pull request #2298 from ether/reflow-toolbar-properly 
Reflow toolbar properly
 2014-11-15 15:37:28 +00:00
John McLear
a52743d8f1 Merge pull request #2282 from ether/chrome-paste 
Chrome browser change wrapping type
 2014-11-13 13:00:32 +00:00
John McLear
e5d77c3763 indentation 2014-11-12 21:39:03 +00:00
Prateek Saxena
2d597a4cab Add keyboard shortcut to Clear Authorship Colors. Fixes #2292 2014-11-07 14:01:32 +05:30
John McLear
fc5152c2f3 remove logging 2014-11-06 17:38:38 +00:00
John McLear
d13b6162f0 this looks way better 2014-11-06 15:50:55 +00:00