Cristo
|
f7dd756642
|
Update API.js
|
2014-11-12 19:53:56 +01:00 |
|
Cristo
|
f59238fe58
|
Update API.js
|
2014-11-12 19:50:43 +01:00 |
|
Cristo
|
24ac082cae
|
Update API.js
|
2014-11-12 19:49:08 +01:00 |
|
Cristo
|
9d39c9591a
|
update pad clients
|
2014-11-12 19:46:50 +01:00 |
|
John McLear
|
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 |
|
John McLear
|
f0423349b5
|
Merge pull request #2303 from prtksxna/kbdtitle
Add keyboard shortcut for "Clear Authorshop Colors" in en locale
|
2014-11-09 11:57:01 +00:00 |
|
Prateek Saxena
|
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 |
|
Cristo
|
46bc328896
|
new api ver
|
2014-11-08 01:41:23 +01:00 |
|
Cristo
|
c33c6e085e
|
comment addded
|
2014-11-08 01:39:27 +01:00 |
|
Cristo
|
d246a191c6
|
Added option to restore revisions #1791
|
2014-11-08 01:12:40 +01:00 |
|
John McLear
|
e1fe1f0f9c
|
Merge pull request #2299 from prtksxna/colorauth
Add keyboard shortcut to Clear Authorship Colors. Fixes #2292
|
2014-11-07 10:40:26 +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
|
3eb0652b21
|
fix pg
|
2014-11-06 16:38:31 +00:00 |
|
John McLear
|
d13b6162f0
|
this looks way better
|
2014-11-06 15:50:55 +00:00 |
|
John McLear
|
0685e563ed
|
working on resize
|
2014-11-06 15:43:21 +00:00 |
|
John McLear
|
96d6e7c1b7
|
cleaner reflow
|
2014-11-06 15:12:40 +00:00 |
|
John McLear
|
9170effb27
|
working redraw and draw on startup
|
2014-11-06 15:09:44 +00:00 |
|
John McLear
|
7d04d7309f
|
reflow buttons based on browser size, much better
|
2014-11-06 14:32:20 +00:00 |
|
John McLear
|
57f56d8fe1
|
bump express to a working version
|
2014-11-04 23:42:40 +00:00 |
|
John McLear
|
053ff3097d
|
whoops I missed this one
|
2014-11-04 23:29:45 +00:00 |
|
John McLear
|
9fa77cdea2
|
working handling of setting client ip and anonymizing etc
|
2014-11-04 23:25:18 +00:00 |
|
John McLear
|
f418dfa205
|
fix author notification handler
|
2014-11-04 22:37:10 +00:00 |
|
John McLear
|
af3e8e5e15
|
fix room client leave
|
2014-11-04 22:34:43 +00:00 |
|
John McLear
|
8391f902fb
|
re-apply roomsize
|
2014-11-04 22:31:09 +00:00 |
|
John McLear
|
a6cbb4af40
|
working messages
|
2014-11-04 19:58:38 +00:00 |
|
John McLear
|
68eaa09708
|
Begin to repair damage done to rooms logic
|
2014-11-04 19:55:05 +00:00 |
|
John McLear
|
95e7b0f156
|
transports
|
2014-11-04 19:11:06 +00:00 |
|
John McLear
|
cb28d10963
|
move logging into debug environment variable .. sighs
|
2014-11-04 18:32:26 +00:00 |
|
John McLear
|
5d0ccb5f8f
|
auth fix
|
2014-11-04 18:17:39 +00:00 |
|
John McLear
|
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 |
|
John McLear
|
1e53c4f5f0
|
identify which parts are causing issues and comment them out, obviously this needs fixing
|
2014-11-04 17:57:18 +00:00 |
|
John McLear
|
c7061e47db
|
use request and a remote ep plugin only endpoint
|
2014-11-04 17:06:47 +00:00 |
|
John McLear
|
b59f6a4d6f
|
Update ace2_inner.js
|
2014-11-04 15:50:53 +00:00 |
|
John McLear
|
b61d8d99d1
|
Update package.json
|
2014-11-03 17:15:22 +00:00 |
|
John McLear
|
3ddf88dece
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2014-11-02 00:32:29 +00:00 |
|
John McLear
|
2c801cc558
|
no errors but no connections
|
2014-11-01 22:36:19 +00:00 |
|
John McLear
|
a67e805da0
|
basics, still not working
|
2014-11-01 21:25:49 +00:00 |
|
John McLear
|
124ae31137
|
blah push back for imports
|
2014-11-01 21:15:31 +00:00 |
|
John McLear
|
1530757d8e
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2014-11-01 21:12:53 +00:00 |
|
John McLear
|
ff549db261
|
use latest jsdom
|
2014-11-01 20:58:56 +00:00 |
|
John McLear
|
a22b558a2c
|
change to proper IE check
|
2014-11-01 20:21:48 +00:00 |
|
John McLear
|
9b8398d0bd
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2014-11-01 20:20:19 +00:00 |
|
John McLear
|
d54bb52b75
|
Fixes #1414
https://github.com/ether/etherpad-lite/issues/1414
|
2014-11-01 18:18:25 +00:00 |
|
John McLear
|
bf380eea50
|
take line breaks and treat them appropriatly instead of creating a space for them..
|
2014-11-01 18:07:34 +00:00 |
|
John McLear
|
4b488bc8af
|
Merge pull request #2116 from jdittrich/updateUnderscore
Underscore Version: Update package.json
|
2014-11-01 16:37:00 +00:00 |
|
John McLear
|
41b7f99204
|
Bump resolve
Update dep fixes https://github.com/ether/etherpad-lite/issues/2050
|
2014-11-01 16:25:14 +00:00 |
|
John McLear
|
3ebcaad31f
|
Update README.md
|
2014-11-01 12:36:57 +00:00 |
|
John McLear
|
51b9af9df0
|
bump ueberdb again
|
2014-10-30 16:12:17 +00:00 |
|
John McLear
|
cd8ea040ad
|
bump ueber to require working mysql
|
2014-10-30 14:41:21 +00:00 |