public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,175 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

3175 Commits (fb917b3d78575290f70e02a66e23773f2c14f76c)

Author SHA1 Message Date
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
Marcel Klehr 76c879bb47 /admin/plugins: Fix for smaller screens 2013-03-26 20:41:24 +01:00
Marcel Klehr 806926d0f6 /admin/plugins: If a user installs sth scroll up to the loading indicator 2013-03-26 19:54:23 +01:00
Marcel Klehr 4edb3b7ab3 /admin/plugins: Fix infinite scroll for larger screens 2013-03-26 19:32:15 +01:00
Marcel Klehr 2393dcd652 Disable search until registry is loaded and fix sorting by version 
... and always display a scrollbar.
 2013-03-26 19:22:04 +01:00
Marcel Klehr f75a839cd0 Remove plugin prefix in pluin lists and make links to plugins more clear 2013-03-26 18:39:46 +01:00
John McLear 2266061eea Merge pull request #1673 from neurolit/api-doc-errors 
API documentation: listAllPads() returns {padIDs: [...]} instead of [...]
 2013-03-26 08:40:59 -07:00
neurolit e96baf6ef1 API documentation: listAllPads() returns {padIDs: [...]} instead of [...] 2013-03-26 16:37:57 +01:00
Marcel Klehr 7edfff7574 /admin/plugins: Show some text if nothing is display otherwise 2013-03-26 16:23:47 +01:00
Marcel Klehr 638cea5fd6 Install and uninstall plugins with style 
- Don't block the whole page when installing a plugin
- allow people to search and install other plugins meanwhile

Why? http://i.imgur.com/XoX6uYS.jpg
 2013-03-26 15:11:30 +01:00
Marcel Klehr 981a33f01e pluginfw/installer.js fire callbacks only once 2013-03-26 14:40:19 +01:00
Marcel Klehr aca5d150e4 /admin/plugins: Don't list installed plugins as available 2013-03-26 11:58:31 +01:00
Marcel Klehr 511407241a /admin/plugins: Make it display the same amount of plugins after sorting 2013-03-26 11:38:51 +01:00
Marcel Klehr 5d7a8adcb7 Silence npm when using npm.commands.search 2013-03-26 11:33:04 +01:00
Marcel Klehr 9109bd206e Catch all errors in pluginfw/installer.js 2013-03-26 11:20:12 +01:00
Marcel Klehr e8bae61cf5 /admin/plugins: Add progress indicators and report errors 2013-03-26 11:19:36 +01:00
John McLear 8b7db49f9c Merge pull request #1671 from ether/ace_document_expose 
expose ace document, reqjired for various plugins
 2013-03-25 18:56:59 -07:00
John McLear 6b55d13370 expose ace document, reqjired for various plugins 2013-03-26 01:54:01 +00:00