libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3856 commits 2 branches 0 tags 24 MiB
Commit graph

3856 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
b71fb3ad20 fix issue with attributes 2014-12-23 02:38:50 +00:00
John McLear
70ba525430 Merge pull request #2368 from ether/hook_for_exportHTMLStyles 
Hook for export html styles
 2014-12-22 02:32:50 +00:00
John McLear
fdc930de3d Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles 2014-12-21 23:43:21 +00:00
John McLear
ee3f3b8060 move clean css back to fix minification on TS 2014-12-21 23:42:56 +00:00
John McLear
4573796166 fix 2014-12-21 23:16:23 +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
ffdce760d5 remove unused long paths from windows build 2014-12-21 22:05:07 +00:00
Marcel Klehr
70dc5e7ed9 Merge pull request #2380 from webzwo0i/fix-add-saved-revision-typo 
fix typo in addSavedRevisions
 2014-12-18 20:21:42 +01:00
webzwo0i
69bad8b30c fix typo in addSavedRevisions 2014-12-17 01:10:20 +01: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
John McLear
197a41627d allow plugins to add multiple styles 2014-12-09 17:34:52 +00:00
John McLear
fccfc3bd41 docs 2014-12-09 16:16:19 +00:00
John McLear
3a2669b704 additional tag support hook 2014-12-09 16:13:52 +00:00
John McLear
e57c8fa763 Merge pull request #2370 from simong/shardable-socket-io 
Don't hardcode /socket.io
 2014-12-09 15:58:51 +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
b94a525e07 docs 2014-12-09 01:35:59 +00:00
John McLear
f11bdc1b44 also logic to add attributes for properties 2014-12-09 01:31:40 +00:00
John McLear
ce004f9c59 docs 2014-12-08 19:48:02 +00:00
John McLear
f2c155ee1a blah use async 2014-12-08 19:44:40 +00:00
John McLear
7cf0e4a9ae allow padId to be passed into the hook 2014-12-08 19:11:45 +00:00
John McLear
2218cbd252 docs 2014-12-08 19:08:12 +00:00
John McLear
6080de9d79 Merge pull request #2348 from ether/sanitizer 
sanitizer change
 2014-12-04 17:31:42 +00:00
John McLear
89adbb9f12 Merge pull request #2329 from timrchavez/rebuild-pad-script 
Restore pad to new location at a given revision
 2014-12-04 02:34:21 +00:00
John McLear
08097975ed Merge pull request #2361 from seanhussey/patch-1 
Fix typo
 2014-12-04 02:33:15 +00:00
Timothy Chavez
c7b1aebfe8 Make changes based on code review 
Simplified the cloning process, added validation checks to ensure the
new pad ID is valid and that a pad doesn't already exist with that ID.
Also fixed a bug in the chatHead cloning loop and added the ability to
specify a pad ID on the command the line (defaulting to the original
"-rebuilt" pad ID formula)
 2014-12-03 20:11:39 -06:00
Sean Hussey
d0896806d9 Fix typo 2014-12-03 11:43:15 -05: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
b5a0767f32 Merge pull request #2350 from ether/require-kernel-change 
Require kernel change
 2014-11-30 23:30:00 +00:00
John McLear
6fea3a25f8 stop death on no session 2014-11-30 21:21:58 +00:00
John McLear
e9686c0d93 Merge branch 'require-kernel-change' of https://github.com/ether/etherpad-lite into require-kernel-change 2014-11-29 03:08:42 +00:00
John McLear
d7e980cd47 yet more minor css polish 2014-11-29 02:24:19 +00:00
John McLear
12f25d8a45 bump cleancss 2014-11-29 01:31:04 +00:00
John McLear
607c2119a9 Merge branch 'develop' of https://github.com/ether/etherpad-lite into require-kernel-change 2014-11-29 00:56:18 +00:00
John McLear
71a31a0fc8 Merge branch 'require-kernel-change' of https://github.com/ether/etherpad-lite into require-kernel-change 2014-11-29 00:56:14 +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
3f11b549e9 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-11-28 23:55:17 +00:00
John McLear
74ffbdea79 bump vs 2014-11-28 18:02:11 +00:00
John McLear
3224122f7e correct kernel v# 2014-11-28 17:47:55 +00:00
John McLear
3bf9f3cf1d Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change 2014-11-28 17:43:01 +00:00