402a4b7b3e
html10n.js: Finally fix two-part locale specs
...
fixes #1706
2013-04-05 14:18:46 +02:00
7cbce4543e
Merge pull request #1710 from ether/remove-chat-trans
...
no need for the language string on that div
2013-04-04 19:42:02 -07:00
6dc4ddd29e
no need for the language string on that div
2013-04-05 03:38:47 +01:00
883be3d48d
begin by adding some template css
2013-04-05 02:21:56 +01:00
0e5a89becc
added full comments to the new API functions.
...
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
2013-04-04 19:07:11 +02:00
3df3b90bd9
fixed missing API functions declaration in API ; fixed a typo in APIHandler.
...
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
2013-04-04 19:06:51 +02:00
380821781f
dont use top, use the scheduler
2013-04-04 02:25:19 +01:00
c5b4e4934d
Kick the user if has already successfully authenticated but his session became invalid later
2013-04-03 11:19:26 +02:00
5855e3d5bf
weird styling
2013-04-02 23:17:25 +01:00
57a9ccbb88
whoops, comments hurt
2013-04-02 23:16:28 +01:00
9e523191ea
whoops padid should be in payload..
2013-04-02 23:15:16 +01:00
8b1a11d5d8
Merge pull request #1697 from ether/longer-timeout
...
Longer timeout
2013-04-02 12:00:07 -07:00
56275d8de7
longer timeout on reconnection
2013-04-02 12:20:38 -07:00
8f1348b40b
Added getAttributePool, getRevisionOfHead and getRevisionChangeset methods to API v1.2.8
...
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
2013-04-01 17:19:48 +02:00
04a53c4402
Merge branch 'feature/support-node-0.10' into develop
...
Conflicts:
src/package.json
2013-04-01 13:29:07 +02:00
98f00e293c
Update ueberDB to add support for node 0.10.x
2013-04-01 13:27:06 +02:00
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
1793e93ea1
Decode the sessionID before sending it to the server since our separator ',' gets encoded
2013-03-31 11:30:01 +02:00
911bfb30e4
Log when a sessionID in checkAccess is not found
2013-03-31 10:56:14 +02:00
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
7e3b288afc
log things the log4js-way; put all the brackets on a new line
2013-03-30 20:46:56 +01:00
253a8e37fd
Added debug-output to SecurityManager.checkAccess to indicate *why* an auth-try failed.
2013-03-30 20:34:45 +01:00
6a5e5cb6fd
Merge pull request #1640 from ether/caret-refactor
...
Caret refactor - I need help with tests...
2013-03-30 09:21:35 -07:00
358b07390e
fix "util.pump() is deprecated. Use readableStream.pipe()"
...
fix error introduced by b3988e3
2013-03-30 15:42:10 +01:00
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
c67c7ca746
remove messy bits
2013-03-29 03:09:10 +00:00
406ff8e6f8
Merge pull request #1681 from ether/loading_block
...
Loading blocks
2013-03-28 20:01:46 -07:00
d73ea4e334
Loading blocks
2013-03-29 02:24:15 +00:00
0ff5137da3
Make revision button glow on ctrl-s and increase duration
2013-03-28 16:39:33 +01:00
59a9ff404d
more settimeout to top window
2013-03-28 13:18:55 +00:00
c489177206
show light yellow for .5 secs on save revision keypress
2013-03-28 02:24:59 +00:00
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
09b32ea694
Merge pull request #1672 from ether/feature/admin-plugins-revamp
...
/admin/plugins revamp
2013-03-27 12:05:00 -07:00
2abb993e8b
Merge pull request #1607 from ether/custom-obj-msg
...
Custom Object messages
2013-03-27 11:50:56 -07:00
40cbe55507
Update en.json
2013-03-27 14:11:20 +00:00
cbee50d42d
/admin/plugins: Display a tooltip when hovering the plugin details link
2013-03-27 12:28:54 +01:00
bc8d6d4c45
/admin/plugins: Add a loading indicator to some messages
2013-03-27 12:20:50 +01:00
c4d9a71156
/admin/plugins: Fix update check
2013-03-27 12:02:19 +01:00
ac0018cdfa
Don't leak event listeners for process:uncaughtException
2013-03-26 21:19:09 +01:00
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
d01a209cbf
/admin/plugins: Dry up displaying of info messages
2013-03-26 21:04:21 +01:00
76c879bb47
/admin/plugins: Fix for smaller screens
2013-03-26 20:41:24 +01:00
806926d0f6
/admin/plugins: If a user installs sth scroll up to the loading indicator
2013-03-26 19:54:23 +01:00
4edb3b7ab3
/admin/plugins: Fix infinite scroll for larger screens
2013-03-26 19:32:15 +01:00
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
f75a839cd0
Remove plugin prefix in pluin lists and make links to plugins more clear
2013-03-26 18:39:46 +01:00
7edfff7574
/admin/plugins: Show some text if nothing is display otherwise
2013-03-26 16:23:47 +01:00
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
981a33f01e
pluginfw/installer.js fire callbacks only once
2013-03-26 14:40:19 +01:00
aca5d150e4
/admin/plugins: Don't list installed plugins as available
2013-03-26 11:58:31 +01:00
511407241a
/admin/plugins: Make it display the same amount of plugins after sorting
2013-03-26 11:38:51 +01:00
5d7a8adcb7
Silence npm when using npm.commands.search
2013-03-26 11:33:04 +01:00
9109bd206e
Catch all errors in pluginfw/installer.js
2013-03-26 11:20:12 +01:00
e8bae61cf5
/admin/plugins: Add progress indicators and report errors
2013-03-26 11:19:36 +01:00
6b55d13370
expose ace document, reqjired for various plugins
2013-03-26 01:54:01 +00:00
b35d9c14fd
/admin/plugins:Hide ep_etherpad-lite in the list of installed plugins
2013-03-25 23:52:10 +01:00
773293991b
admin/plugins: Allow people to sort search results
2013-03-25 23:09:03 +01:00
1ebbcd2f30
Don't leak event listeners in pluginfw/installer.js
...
fixes #921
2013-03-25 17:22:51 +01:00
079fdf0f38
Revamp /admin/plugins
...
- dry up the client-side code
- use the new saner API of pluginfw/installer.js on the server
- Improve UX: allow user to infinitely scroll to display their results
2013-03-25 17:20:10 +01:00
b297784288
Make npm registry access code more sane
2013-03-25 16:51:12 +01:00
0070eab416
Fix caching of npm search results and only make one registry request on /admin/plugins
...
fixes #1488
2013-03-25 12:45:23 +01:00
ef7fb5c7f0
Update npm
2013-03-25 12:18:06 +01:00
2e7a9796de
option to show sticky chat on screen, note i use a literal string, how am i supposed to add a l10n title?
2013-03-24 01:12:01 +00:00
c78aad16ea
adds missing semicolons in src/node/utils folder
2013-03-24 01:18:44 +01:00
d515acae96
expires was never defined
2013-03-23 18:01:44 +00:00
b3988e30d5
pump isdeprecated
2013-03-23 17:55:34 +00:00
35e4891217
Localisation updates from http://translatewiki.net .
2013-03-23 13:26:38 +00:00
0063933041
fix cookies
2013-03-23 02:59:12 +00:00
cbde18945c
Bumped the ueberDB package version to 0.1.96 to add in Cassandra support.
2013-03-22 15:22:17 +00:00
23abafb3cb
Issue #1648 - Long lines without any spaces don't wrap on Firefox, the text ends up going off screen
2013-03-20 15:48:11 -07:00
4ea7ccd104
merge develop
2013-03-20 01:11:27 +00:00
9d14c3708d
Merge pull request #1644 from ether/chatMsgHook
...
hook for chat msg
2013-03-19 18:10:31 -07:00
bcb92f25a6
Refactor chat notifications and the chatNewMessage hook
2013-03-19 20:21:27 +01:00
588fd399cd
Merge pull request #1645 from ether/fix/import-without-files
...
Don't break the whole server if an import failed because no files were u...
2013-03-19 10:41:32 -07:00
c30697cb07
Don't break the whole server if an import failed because no files were uploaded
...
Fixes #1611
2013-03-19 18:40:39 +01:00
a628317b55
Log http on debug log level
...
... and additionally log the response time
2013-03-19 18:34:21 +01:00
a9bd081a44
more clean up
2013-03-19 16:55:42 +00:00
9bb0587447
working and jsonify obj
2013-03-19 16:40:51 +00:00
2916b39c24
make sure the sessionID target is right
2013-03-19 16:21:04 +00:00
cb45c44b4d
Merge pull request #1588 from disy-mk/patch-2
...
fix #1586
2013-03-19 08:47:26 -07:00
d0e656d0a6
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
2013-03-19 13:59:07 +00:00
7741f762e2
hook for chat msg
2013-03-19 02:21:53 +00:00
07adb45503
Merge pull request #1643 from ether/fix/html10n-update
...
Update html10n.js
2013-03-18 14:38:22 -07:00
e49620ea07
update ueber for pg
2013-03-18 21:36:50 +00:00
b3dbf1c995
Update html10n.js
2013-03-18 22:29:42 +01:00
2bc45de106
Fix #1639 by removing bodyParser middleware introduced with swagger REST API
2013-03-18 22:09:47 +01:00
3562672a75
stop start point going negative
2013-03-18 18:44:01 +00:00
27e9f91864
page up, down etc all working, still no shift page up/down for highlight but that never worked anyways
2013-03-18 18:03:37 +00:00
9f54a65c88
refactored arrow keys now work after paste in chrome
2013-03-18 17:40:18 +00:00
83ed9303da
Localisation updates from http://translatewiki.net .
2013-03-18 00:43:57 +00:00
3e0a80cb74
remove console log
2013-03-17 15:17:36 +00:00
693b9b9b94
better mobile support for gritter messages, before it was awful
2013-03-17 01:23:31 +00:00
a1d9d27cde
much cleaner way of showing / hiding overlay
2013-03-16 17:57:23 +00:00
69a4ab76cf
hide modal once reconnect is good
2013-03-16 17:50:53 +00:00
13ad46aa67
a safer approach I think but still be careful
2013-03-16 13:19:12 +00:00
cd9c78998e
Fix path.join in Settings.js
2013-03-16 09:47:10 +01:00
54433db47f
release v1.2.9
2013-03-15 21:43:29 +01:00
84d44d5f0e
Merge pull request #1622 from ether/fix/submitting-submitting-faked-changesets
...
Fix clearing authorship colors which was broken by #1609
2013-03-15 12:20:31 -07:00
de552df6db
Fix clearing authorship colors which was broken by #1609
...
Fixes #1620
2013-03-15 18:08:51 +01:00
cf041dcb08
Merge pull request #1618 from ether/tidy-up
...
Tidy up
2013-03-14 14:32:13 -07:00
Marcel Klehr
