fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,042 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

3042 Commits

Author SHA1 Message Date
John McLear 43f8778241 hrm, maybe this makes sense to a wider audience 2013-04-04 15:35:19 +01:00
John McLear a3136d778d animated image prolly wont work 2013-04-04 01:56:36 +01:00
John McLear a677286a40 line breaks 2 2013-04-04 01:24:09 +01:00
John McLear 2003dd8327 line breaks 2013-04-04 01:22:46 +01:00
John McLear 4f07f829db new readme 2013-04-04 01:20:46 +01:00
John McLear 78d1c5746f Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-04-04 01:00:54 +01:00
John McLear 35d84144db changelog and package file 2013-04-04 00:59:51 +01:00
John McLear 29beda8ebd Merge pull request #1703 from mluto/kick-users-with-invalid-session-2 
Kick the user if the deleteSession-API is called
 2013-04-03 06:40:50 -07:00
mluto c5b4e4934d Kick the user if has already successfully authenticated but his session became invalid later 2013-04-03 11:19:26 +02:00
John McLear f503f28b08 Merge pull request #1699 from ether/fix-custom 
Fix custom obj msg broadcaster to pads
 2013-04-02 15:24:42 -07:00
John McLear 5855e3d5bf weird styling 2013-04-02 23:17:25 +01:00
John McLear 57a9ccbb88 whoops, comments hurt 2013-04-02 23:16:28 +01:00
John McLear 9e523191ea whoops padid should be in payload.. 2013-04-02 23:15:16 +01:00
John McLear 8b1a11d5d8 Merge pull request #1697 from ether/longer-timeout 
Longer timeout
 2013-04-02 12:00:07 -07:00
John McLear 56275d8de7 longer timeout on reconnection 2013-04-02 12:20:38 -07:00
John McLear 42b9351933 Merge pull request #1692 from ether/fix/drop-0.6-support 
Drop support for node v0.6, officially
 2013-04-01 05:09:19 -07:00
Marcel Klehr 782c512e93 Drop support for node v0.6, officially 2013-04-01 14:07:38 +02:00
Marcel Klehr 04a53c4402 Merge branch 'feature/support-node-0.10' into develop 
Conflicts:
	src/package.json
 2013-04-01 13:29:07 +02:00
Marcel Klehr 98f00e293c Update ueberDB to add support for node 0.10.x 2013-04-01 13:27:06 +02:00
John McLear 50066d06e7 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-04-01 00:34:00 -07:00
John McLear 0b2c67e998 Merge pull request #1691 from mluto/socketio-decode-cookie-session 
Decode the sessionID before sending it to the server
 2013-03-31 09:35:02 -07:00
John McLear c1806e54e2 Merge pull request #1689 from mluto/fix-checkAccess-omitted-cb 
Fix missing callback in SecurityManager.checkAccess
 2013-03-31 09:34:54 -07:00
mluto 1793e93ea1 Decode the sessionID before sending it to the server since our separator ',' gets encoded 2013-03-31 11:30:01 +02:00
mluto 911bfb30e4 Log when a sessionID in checkAccess is not found 2013-03-31 10:56:14 +02:00
mluto 30cae9097f When there is just one session and this one is invalid SecurityManager.checkAccess would cause the request to hang forever because the callback is omitted for each invalid session, this fixes this issue. 
validSession still remains false so this does not cause issues further down.
 2013-03-31 10:27:21 +02:00
John McLear 9c36d6f58b Merge pull request #1687 from mluto/checkAccess-debug-output 
Added debug-output to checkAccess to indicate *why* an auth-try failed
 2013-03-30 12:49:21 -07:00
mluto 7e3b288afc log things the log4js-way; put all the brackets on a new line 2013-03-30 20:46:56 +01:00
mluto 253a8e37fd Added debug-output to SecurityManager.checkAccess to indicate *why* an auth-try failed. 2013-03-30 20:34:45 +01:00
John McLear 7c08381d42 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-03-30 09:43:40 -07:00
John McLear 6a5e5cb6fd Merge pull request #1640 from ether/caret-refactor 
Caret refactor - I need help with tests...
 2013-03-30 09:21:35 -07:00
John McLear 778f2d3f80 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-03-30 09:03:00 -07:00
Manuel Knitza 358b07390e fix "util.pump() is deprecated. Use readableStream.pipe()" 
fix error introduced by b3988e3
 2013-03-30 15:42:10 +01:00
John McLear f1b60e9867 Merge pull request #1677 from ether/ctrl-s-fade 
show light yellow for .5 secs on save revision keypress
 2013-03-28 20:11:30 -07:00
John McLear c67c7ca746 remove messy bits 2013-03-29 03:09:10 +00:00
John McLear 406ff8e6f8 Merge pull request #1681 from ether/loading_block 
Loading blocks
 2013-03-28 20:01:46 -07:00
John McLear d73ea4e334 Loading blocks 2013-03-29 02:24:15 +00:00
Marcel Klehr 0ff5137da3 Make revision button glow on ctrl-s and increase duration 2013-03-28 16:39:33 +01:00
John McLear 59a9ff404d more settimeout to top window 2013-03-28 13:18:55 +00:00
John McLear c489177206 show light yellow for .5 secs on save revision keypress 2013-03-28 02:24:59 +00:00
John McLear d134ba9b64 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-03-27 18:04:23 -07:00
John McLear c6041bf0c2 Merge pull request #1675 from ether/fix/process-uncaughtException-event-handler-leak 
Don't leak event listeners for process:uncaughtException
 2013-03-27 12:06:30 -07:00
John McLear 09b32ea694 Merge pull request #1672 from ether/feature/admin-plugins-revamp 
/admin/plugins revamp
 2013-03-27 12:05:00 -07:00
John McLear 2abb993e8b Merge pull request #1607 from ether/custom-obj-msg 
Custom Object messages
 2013-03-27 11:50:56 -07:00
John McLear 40cbe55507 Update en.json 2013-03-27 14:11:20 +00:00
Marcel Klehr cbee50d42d /admin/plugins: Display a tooltip when hovering the plugin details link 2013-03-27 12:28:54 +01:00
Marcel Klehr bc8d6d4c45 /admin/plugins: Add a loading indicator to some messages 2013-03-27 12:20:50 +01:00
Marcel Klehr c4d9a71156 /admin/plugins: Fix update check 2013-03-27 12:02:19 +01:00
Marcel Klehr ac0018cdfa Don't leak event listeners for process:uncaughtException 2013-03-26 21:19:09 +01:00
John McLear cee1ead8f6 Merge pull request #1664 from ether/sticky-chat 
Option to enable Sticky chat from the chat dialogue
 2013-03-26 13:12:01 -07:00
Marcel Klehr d01a209cbf /admin/plugins: Dry up displaying of info messages 2013-03-26 21:04:21 +01:00