70dc5e7ed9
Merge pull request #2380 from webzwo0i/fix-add-saved-revision-typo
...
fix typo in addSavedRevisions
2014-12-18 20:21:42 +01:00
69bad8b30c
fix typo in addSavedRevisions
2014-12-17 01:10:20 +01:00
a2d22a5764
Merge pull request #2377 from webzwo0i/avoid-global-vairables
...
declare var outside of loop
2014-12-16 16:18:01 +00:00
0263d30b37
declare var outside of loop
2014-12-16 17:00:35 +01:00
cfa3f15f94
Merge pull request #2373 from webzwo0i/avoid-global-vairables
...
dont make local variables global
2014-12-16 00:41:41 +00:00
5d15f655f0
dont make local variables global
2014-12-14 22:01:28 +01:00
e57c8fa763
Merge pull request #2370 from simong/shardable-socket-io
...
Don't hardcode /socket.io
2014-12-09 15:58:51 +00:00
45c1ad078b
Allow for shardable Etherpad
2014-12-09 14:59:18 +00:00
6080de9d79
Merge pull request #2348 from ether/sanitizer
...
sanitizer change
2014-12-04 17:31:42 +00:00
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
08097975ed
Merge pull request #2361 from seanhussey/patch-1
...
Fix typo
2014-12-04 02:33:15 +00:00
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
d0896806d9
Fix typo
2014-12-03 11:43:15 -05:00
c1fdd7ff79
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-12-01 15:10:17 +00:00
c539cc7d6b
styling of global view colum
2014-12-01 15:10:03 +00:00
b5a0767f32
Merge pull request #2350 from ether/require-kernel-change
...
Require kernel change
2014-11-30 23:30:00 +00:00
6fea3a25f8
stop death on no session
2014-11-30 21:21:58 +00:00
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
d7e980cd47
yet more minor css polish
2014-11-29 02:24:19 +00:00
12f25d8a45
bump cleancss
2014-11-29 01:31:04 +00:00
607c2119a9
Merge branch 'develop' of https://github.com/ether/etherpad-lite into require-kernel-change
2014-11-29 00:56:18 +00:00
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
ed96c13a1f
minor ui polish
2014-11-29 00:54:06 +00:00
ee585f0457
color picker on mobile actually shows on screen
2014-11-29 00:32:37 +00:00
34f7625739
a little more polish
2014-11-29 00:30:13 +00:00
53887db872
mobile ui polish
2014-11-29 00:26:25 +00:00
3f11b549e9
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-28 23:55:17 +00:00
74ffbdea79
bump vs
2014-11-28 18:02:11 +00:00
3224122f7e
correct kernel v#
2014-11-28 17:47:55 +00:00
3bf9f3cf1d
Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change
2014-11-28 17:43:01 +00:00
acc6003747
Merge branch 'develop' of https://github.com/ether/etherpad-lite into require-kernel-change
2014-11-28 16:45:06 +00:00
c6d7ed114e
script to update all plugins with one command on CLI
2014-11-28 16:27:12 +00:00
a642deaa72
gritter css fix
2014-11-28 02:25:21 +00:00
68979e1212
better fix
2014-11-28 00:35:46 +00:00
e6d85bbe69
fix issue with top of chatbox not being aligned properly
2014-11-28 00:26:34 +00:00
edc5669fa6
Merge pull request #2344 from ether/backend-tests
...
Backend tests
2014-11-28 00:04:12 +00:00
d974e881a8
Merge branch 'develop' of github.com:ether/etherpad-lite into sanitizer
2014-11-28 00:02:16 +00:00
422cfec27a
Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change
2014-11-28 00:01:47 +00:00
8b787b8d23
readme docs for backend tests
2014-11-27 23:58:50 +00:00
936e92e044
fix tests in FF
2014-11-27 23:48:14 +00:00
d36911da30
fix timeslider tests
2014-11-27 23:36:19 +00:00
47029f2e6b
diable caret tests for now
2014-11-27 23:10:40 +00:00
617514b335
mst tests still brkoen but it runs
2014-11-27 17:12:24 +00:00
ff58897679
fix frontend tests
2014-11-27 16:58:04 +00:00
3ca48ed975
fix undo in chrome etc
2014-11-27 16:49:08 +00:00
c13301966f
yeah need htis too
2014-11-27 02:56:42 +00:00
61c6deda2e
use a forked require-kernel
2014-11-27 02:44:48 +00:00
65fb25d71f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-27 02:24:12 +00:00
2c728b8e1b
sanitizer change
2014-11-27 00:45:22 +00:00
e51ab2db24
fix for #2132
2014-11-26 23:37:44 +00:00
Marcel Klehr