19c78212e8
Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished
...
Fix lineassembler not finished
2014-12-30 12:19:04 +01:00
a07d1722fc
no errors on chrome client
2014-12-30 12:12:24 +01:00
5ba3cab445
better take some responsibility
2014-12-30 00:13:01 +01:00
ac4f9eb4ce
licensing
2014-12-30 00:12:26 +01:00
99a239fa9a
remove console log
2014-12-30 00:10:08 +01:00
0676d2fe24
working author import
2014-12-30 00:01:15 +01:00
b8648b4a49
remove error logging
2014-12-29 23:08:42 +01:00
1e0de620be
more author logic
2014-12-29 23:08:17 +01:00
ec2b844f94
authors
2014-12-29 22:51:31 +01:00
a2262c56b9
msg for user
2014-12-29 22:05:14 +01:00
a6400b3f61
allow only for pads less than 10 to be overwritten
2014-12-29 22:02:24 +01:00
ab5e7381a2
working for all files
2014-12-29 21:35:10 +01:00
1081156f13
whoopsi, required files
2014-12-29 21:13:49 +01:00
3773b6346b
semi working requires browser refresh
2014-12-29 20:57:58 +01:00
6e4e034e42
fix closing of lists
2014-12-29 16:27:40 +01:00
e1c683be3f
differentiate between indents and bullets in unordered lists
2014-12-29 16:12:07 +01:00
302ceb665b
delay write to fix copypad -- bad practice but due to db.set not allowing callback
2014-12-29 14:59:22 +01:00
3fe802077c
Merge pull request #2091 from webzwo0i/disconnect-if-an-old-cs-is-submitted-twice
...
disconnect client if it submits an already accepted changeset based on a...
2014-12-29 02:01:03 +01:00
c4959b089f
resolve merge conflict
2014-12-29 01:54:44 +01:00
321d550d43
second fix for user list issue on #2413
2014-12-29 01:20:28 +01:00
23570e80a7
unbind before rebind, partial fix towards #2413 issue
2014-12-29 01:17:24 +01:00
248d7655d7
Merge pull request #2401 from ether/save-prefs
...
set prefs and get prefs
2014-12-29 01:01:09 +01:00
8603fb4583
fix sockets of switch to pad
2014-12-29 00:46:47 +01:00
6b1fee400d
Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest
2014-12-29 00:40:07 +01:00
018821e98c
Use camel case
2014-12-28 22:20:09 +01:00
74eca43965
Merge pull request #2014 from eyesonlyhack/closeExtendedChatWindow
...
Close extended chat window
2014-12-28 20:17:30 +01:00
2307c6fbda
Notify user if cookies can't be created
2014-12-28 15:02:56 +01:00
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
362315c638
AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left
2014-12-28 12:34:42 +01:00
6ca2c91fdf
close and open lists according to the actual line.listLevel
2014-12-28 02:32:53 +01:00
d71b11f4b2
fix export of lists with bullets; <li> are closed before the next list starts. also, when closing, ensure that list-items are not nested
2014-12-28 02:31:26 +01:00
dd09f6144b
Merge pull request #2398 from ether/indentLevels
...
Indent levels
2014-12-27 23:27:11 +01:00
c276343216
timeslider fixes
2014-12-27 22:31:23 +01:00
9cf19b99fe
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
2014-12-27 22:25:24 +01:00
b1f29b914c
minor ts bg fix
2014-12-27 22:05:35 +01:00
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
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
251a75346d
make stringIterator aware of newlines
2014-12-27 19:25:14 +01:00
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
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
ddd6a8ebce
Localisation updates from https://translatewiki.net .
2014-12-27 17:59:55 +01:00
07a6702363
Revert "be more strict in checkRep"
...
This reverts commit 22803da42f
2014-12-27 17:56:20 +01:00
a645aeef5c
Merge pull request #2400 from Gared/fix/author-not-set
...
Prevent server crash if author is not set
2014-12-27 16:15:26 +01:00
a63880dcb1
Fix AttributeManager#removeAttributeOnLine: Only remove a single attrib
2014-12-27 16:15:20 +01:00
a151c207c2
set prefs and get prefs
2014-12-27 15:08:54 +01:00
40c7ee9df9
Prevent server crash if author is not set
2014-12-27 14:26:05 +01:00
ae22332f71
removing dokuwiki
2014-12-27 14:08:45 +01:00
6ac99ab03f
support for export
2014-12-27 13:27:07 +01:00
9d66a446dc
support indentation up to 16 levels and dont go back afterwards
2014-12-27 13:18:58 +01:00
10d92b6bf1
slightly better attribute selection logic but still pretty b0rked
2014-12-26 23:42:00 +00:00
88ab74b1e9
fix flowing of items in editbar
2014-12-24 17:54:13 +00:00
b71fb3ad20
fix issue with attributes
2014-12-23 02:38:50 +00:00
fdc930de3d
Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles
2014-12-21 23:43:21 +00:00
ee3f3b8060
move clean css back to fix minification on TS
2014-12-21 23:42:56 +00:00
4573796166
fix
2014-12-21 23:16:23 +00:00
3fe58068c0
more fixes
2014-12-21 23:16:00 +00:00
12aac2d0d0
Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles
2014-12-21 23:12:59 +00:00
745ef5db1c
fix timeslider socket issue
2014-12-21 23:10:56 +00:00
69bad8b30c
fix typo in addSavedRevisions
2014-12-17 01:10:20 +01:00
b204aa2085
remove more dead requires.
2014-12-16 19:10:01 +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
a2dbf8761f
allow for timeslider custom messages
2014-12-10 01:23:24 +00:00
197a41627d
allow plugins to add multiple styles
2014-12-09 17:34:52 +00:00
3a2669b704
additional tag support hook
2014-12-09 16:13:52 +00:00
45c1ad078b
Allow for shardable Etherpad
2014-12-09 14:59:18 +00:00
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
f11bdc1b44
also logic to add attributes for properties
2014-12-09 01:31:40 +00:00
f2c155ee1a
blah use async
2014-12-08 19:44:40 +00:00
7cf0e4a9ae
allow padId to be passed into the hook
2014-12-08 19:11:45 +00:00
2218cbd252
docs
2014-12-08 19:08:12 +00:00
6080de9d79
Merge pull request #2348 from ether/sanitizer
...
sanitizer change
2014-12-04 17:31:42 +00:00
22803da42f
be more strict in checkRep
2014-12-04 16:12:13 +01:00
5306f0c98a
wrap appendRevision in try-catch block
2014-12-04 16:05:02 +01:00
10c2f72720
dont remove more lines than exist in the whole text
2014-12-04 16:01:39 +01: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
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
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
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
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
2c728b8e1b
sanitizer change
2014-11-27 00:45:22 +00:00
e51ab2db24
fix for #2132
2014-11-26 23:37:44 +00:00
cff8f4a61e
remember to add supertest
2014-11-26 21:58:27 +00:00
16f3ebb3ba
handle auth fails
2014-11-26 17:34:44 +00:00
88b3d99fbd
Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests
2014-11-26 15:33:13 +00:00
0a84379364
make additional line break at end of imported doc
2014-11-26 15:19:22 +00:00
a4be5b4fd7
mocha version
2014-11-26 01:03:57 +00:00
8851b8ab6b
Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-away
2014-11-25 22:48:09 +00:00
881763f663
remove jsdom dep
2014-11-25 22:15:29 +00:00
77de2d918b
multiline
2014-11-25 22:14:48 +00:00
ad7de8277d
mocha
2014-11-25 22:12:25 +00:00
5c3874c0a1
really recreate socketio-client in expressCreateServer, fixes #2342
...
When using plugins, the express server gets restarted. When we do that,
the socketio-server should also get restarted. It doesn't. That means
that all the events in SocketIORouter.js are bound twice, which causes
chaos all over etherpad.
This changes our socketio.js so it fully recreates the io-instance when
we restart the server.
introduced in 95e7b0f156
2014-11-25 22:38:22 +01:00
2a062f8dc3
mheh no browser requirement at all
2014-11-25 18:18:42 +00:00
c2c0cb6907
so yeah, prolly can do this anyway?
2014-11-25 18:07:34 +00:00
60d44cd3df
use cheerio instead of jsdom
2014-11-25 17:26:09 +00:00
a3f6b2edb7
more fixes
2014-11-23 22:33:56 +00:00
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
73bcbbcb89
final commit
2014-11-23 14:15:03 +00:00
0eb7cc7864
Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admin-etc
2014-11-23 14:14:11 +00:00
ae7da122d7
fix session management
2014-11-23 14:14:01 +00:00
5f2e830b72
whoopsi
2014-11-22 19:13:23 +00:00
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
764b8af5e3
Merge pull request #2334 from luto/api-mystery-crash
...
fix api mystery crash
2014-11-22 15:50:23 +00:00
4eee89ad12
fix api mystery crash
2014-11-22 16:46:37 +01:00
4e31ec8ab9
Changed relative path to Etherpad main page in admin settings.
...
There was one '../' too much.
2014-11-22 10:24:30 +01:00
488d6890f9
minor styling
2014-11-21 00:15:55 +00:00
703440acd7
missing socketio fix
2014-11-21 00:11:50 +00:00
ff9a2a687f
whoops fix animation not to look broken
2014-11-19 18:27:55 +00:00
28c7b666c1
correct file links
2014-11-19 00:24:14 +00:00
16d8068d7d
Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons
2014-11-19 00:17:01 +00:00
9aea689438
move tiny bit of font awesome we actually use into pad.css
2014-11-19 00:16:08 +00:00
0f1fd0b281
working blocks
2014-11-18 23:51:22 +00:00
f5dcc374ba
slight ui fix
2014-11-18 23:15:56 +00:00
e821cb13fa
more polish
2014-11-18 22:47:20 +00:00
95cb721914
clean up
2014-11-18 22:41:00 +00:00
09b08e5a72
working pause
2014-11-18 22:29:46 +00:00
e2410e41b0
more polish
2014-11-18 22:24:16 +00:00
a06f01c04a
some timeslider styling but this wont be completed by me
2014-11-18 22:21:36 +00:00
645ec830b0
Don't crash on bad plugins.json; fixes #2323
2014-11-18 13:59:36 -08:00
0bea3a3af6
no image on timeslider
2014-11-18 21:13:21 +00:00
4a12eec3e0
a font lookup file
2014-11-18 21:10:40 +00:00
9712f852e9
remove connecting bar image
2014-11-18 19:16:50 +00:00
9b5ee93bce
spinning loading icons
2014-11-18 19:13:51 +00:00
3ad9a58895
fontello config file
2014-11-18 18:47:12 +00:00
21ce9b4dd3
correct font stuff
2014-11-18 18:44:45 +00:00
c14e1696b3
remove stuff, new files
2014-11-18 18:09:29 +00:00
3e8f3cd938
hrm I dont trust this security
2014-11-18 14:56:40 +00:00
ff603d7b58
stability restored now to handle the auth issues
2014-11-18 14:12:02 +00:00
d10013c159
client side code now fixed
2014-11-18 14:10:38 +00:00
020b636b1f
template of a semi-fix
2014-11-18 14:08:44 +00:00
135aa3e8fe
Merge pull request #1783 from simong/removed-console-in-html10n
...
Removed console wrapping in html10n as it's breaking in PhantomJS.
2014-11-15 18:08:53 +01:00
d7a181be67
Nooping console.foo in html10n.js when the method is not defined.
2014-11-15 16:31:19 +00:00
865829e159
Merge pull request #1682 from luto/fix-listSessionsOfGroup
...
Don't error in listSessionsOfGroup when there are non-existing sessions
2014-11-15 16:25:23 +00:00
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
3bf108f3b4
Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types
...
Allow for a setting so you can stop unknown file types from being imported
2014-11-15 15:41:08 +00:00
4986dd11ee
merging
2014-11-15 15:39:46 +00:00
eff4863a22
Merge pull request #2290 from ether/IE11-null-password
...
change to proper IE check
2014-11-15 15:37:53 +00:00
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
8d2fa35b3f
Merge pull request #2298 from ether/reflow-toolbar-properly
...
Reflow toolbar properly
2014-11-15 15:37:28 +00:00
cce2d7279a
resolve merge issues
2014-11-15 15:34:18 +00:00
a75f02cddf
Merge pull request #2300 from cristo-rabani/patch-1
...
Added option to restore revisions #1791
2014-11-15 15:32:24 +00:00
e8fda27ead
Localisation updates from https://translatewiki.net .
2014-11-14 13:42:39 +01:00
a52743d8f1
Merge pull request #2282 from ether/chrome-paste
...
Chrome browser change wrapping type
2014-11-13 13:00:32 +00:00
e5d77c3763
indentation
2014-11-12 21:39:03 +00:00
0253156dbb
Update APIHandler.js
2014-11-12 19:55:37 +01:00
f7dd756642
Update API.js
2014-11-12 19:53:56 +01:00
f59238fe58
Update API.js
2014-11-12 19:50:43 +01:00
24ac082cae
Update API.js
2014-11-12 19:49:08 +01:00
9d39c9591a
update pad clients
2014-11-12 19:46:50 +01:00
07d29a5d7a
Merge pull request #2219 from Gared/fix_css
...
Fix position of import/export popup in timeslider
2014-11-12 15:18:25 +00:00
60b698f69b
Add keyboard shortcut for "Clear Authorshop Colors" in en locale
...
Translate wiki should pick this up and the translations will
start coming in a while. #2292
2014-11-09 09:18:50 +05:30
46bc328896
new api ver
2014-11-08 01:41:23 +01:00
c33c6e085e
comment addded
2014-11-08 01:39:27 +01:00
d246a191c6
Added option to restore revisions #1791
2014-11-08 01:12:40 +01:00
2d597a4cab
Add keyboard shortcut to Clear Authorship Colors. Fixes #2292
2014-11-07 14:01:32 +05:30
fc5152c2f3
remove logging
2014-11-06 17:38:38 +00:00
3eb0652b21
fix pg
2014-11-06 16:38:31 +00:00
d13b6162f0
this looks way better
2014-11-06 15:50:55 +00:00
0685e563ed
working on resize
2014-11-06 15:43:21 +00:00
96d6e7c1b7
cleaner reflow
2014-11-06 15:12:40 +00:00
9170effb27
working redraw and draw on startup
2014-11-06 15:09:44 +00:00
7d04d7309f
reflow buttons based on browser size, much better
2014-11-06 14:32:20 +00:00
57f56d8fe1
bump express to a working version
2014-11-04 23:42:40 +00:00
053ff3097d
whoops I missed this one
2014-11-04 23:29:45 +00:00
9fa77cdea2
working handling of setting client ip and anonymizing etc
2014-11-04 23:25:18 +00:00
f418dfa205
fix author notification handler
2014-11-04 22:37:10 +00:00
af3e8e5e15
fix room client leave
2014-11-04 22:34:43 +00:00
8391f902fb
re-apply roomsize
2014-11-04 22:31:09 +00:00
a6cbb4af40
working messages
2014-11-04 19:58:38 +00:00
68eaa09708
Begin to repair damage done to rooms logic
2014-11-04 19:55:05 +00:00
95e7b0f156
transports
2014-11-04 19:11:06 +00:00
cb28d10963
move logging into debug environment variable .. sighs
2014-11-04 18:32:26 +00:00
5d0ccb5f8f
auth fix
2014-11-04 18:17:39 +00:00
adef0af227
more stuff required to stop it crashing, now we have identified what needs fixing we can fix it
2014-11-04 18:01:41 +00:00
1e53c4f5f0
identify which parts are causing issues and comment them out, obviously this needs fixing
2014-11-04 17:57:18 +00:00
c7061e47db
use request and a remote ep plugin only endpoint
2014-11-04 17:06:47 +00:00
b59f6a4d6f
Update ace2_inner.js
2014-11-04 15:50:53 +00:00
b61d8d99d1
Update package.json
2014-11-03 17:15:22 +00:00
2c801cc558
no errors but no connections
2014-11-01 22:36:19 +00:00
John McLear