Marcel Klehr
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
Marcel Klehr
b297784288
Make npm registry access code more sane
2013-03-25 16:51:12 +01:00
Marcel Klehr
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
Marcel Klehr
ef7fb5c7f0
Update npm
2013-03-25 12:18:06 +01:00
John McLear
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
John McLear
34e3e2f432
Merge pull request #1662 from disy-mk/jshint_semicol_utils
...
adds missing semicolons in src/node/utils folder
2013-03-23 17:31:33 -07:00
disy-mk
c78aad16ea
adds missing semicolons in src/node/utils folder
2013-03-24 01:18:44 +01:00
John McLear
d515acae96
expires was never defined
2013-03-23 18:01:44 +00:00
John McLear
b3988e30d5
pump isdeprecated
2013-03-23 17:55:34 +00:00
John McLear
af80e37ac7
missed this one..
2013-03-23 15:03:56 +00:00
John McLear
c565b5bde4
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2013-03-23 07:59:33 -07:00
John McLear
ab2e805aa0
changelog
2013-03-23 14:50:00 +00:00
Siebrand Mazeland
35e4891217
Localisation updates from http://translatewiki.net .
2013-03-23 13:26:38 +00:00
Marcel Klehr
5ede02ffb7
Merge pull request #1656 from ether/cookies
...
fix cookies
2013-03-23 04:08:27 -07:00
John McLear
0063933041
fix cookies
2013-03-23 02:59:12 +00:00
John McLear
e050ad57e4
fix typo
2013-03-22 17:39:22 +00:00
John McLear
73afc595e5
Merge pull request #1655 from simong/cassandra
...
Bumped the ueberDB package version to 0.1.96 to add in Cassandra support
2013-03-22 08:24:34 -07:00
Simon Gaeremynck
cbde18945c
Bumped the ueberDB package version to 0.1.96 to add in Cassandra support.
2013-03-22 15:22:17 +00:00
John McLear
2c34f6673c
Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop
2013-03-21 18:49:03 -07:00
John McLear
1bf9d53f6a
Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop
2013-03-21 16:47:37 -07:00
John McLear
09edfb0d5e
Merge pull request #1649 from sahilamoli/FirefoxFixForLineBreaks
...
Issue #1648 - Long lines without any spaces don't wrap on Firefox
2013-03-20 16:36:10 -07:00
Sahil Amoli
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
John McLear
d40a64893c
Merge pull request #1633 from ether/mobile-msg-css
...
better mobile support for gritter messages, before it was awful
2013-03-19 18:17:31 -07:00
John McLear
2a1859cc6d
mm k
2013-03-20 01:14:04 +00:00
John McLear
4ea7ccd104
merge develop
2013-03-20 01:11:27 +00:00
John McLear
9d14c3708d
Merge pull request #1644 from ether/chatMsgHook
...
hook for chat msg
2013-03-19 18:10:31 -07:00
Marcel Klehr
bcb92f25a6
Refactor chat notifications and the chatNewMessage hook
2013-03-19 20:21:27 +01:00
John McLear
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
Marcel Klehr
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
John McLear
5e07f24c69
Merge pull request #1646 from ether/feature/log-http-on-debug-level
...
Log http on debug log level
2013-03-19 10:39:15 -07:00
Marcel Klehr
a628317b55
Log http on debug log level
...
... and additionally log the response time
2013-03-19 18:34:21 +01:00
John McLear
a9bd081a44
more clean up
2013-03-19 16:55:42 +00:00
John McLear
9bb0587447
working and jsonify obj
2013-03-19 16:40:51 +00:00
John McLear
2916b39c24
make sure the sessionID target is right
2013-03-19 16:21:04 +00:00
Marcel Klehr
cb45c44b4d
Merge pull request #1588 from disy-mk/patch-2
...
fix #1586
2013-03-19 08:47:26 -07:00
John McLear
d0e656d0a6
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
2013-03-19 13:59:07 +00:00
John McLear
11341eb095
add a test to show weird behavior
2013-03-19 12:52:14 +00:00
John McLear
8406cc95ab
docs for hook
2013-03-19 03:43:38 +00:00
John McLear
7741f762e2
hook for chat msg
2013-03-19 02:21:53 +00:00
John McLear
13ee96dce0
more tests but still fundamental flaw with arrow keys
2013-03-18 22:14:41 +00:00
John McLear
ee6a7d0b0c
most test pass but important ones failed
2013-03-18 22:09:51 +00:00
John McLear
07adb45503
Merge pull request #1643 from ether/fix/html10n-update
...
Update html10n.js
2013-03-18 14:38:22 -07:00
John McLear
e49620ea07
update ueber for pg
2013-03-18 21:36:50 +00:00
Marcel Klehr
b3dbf1c995
Update html10n.js
2013-03-18 22:29:42 +01:00
John McLear
65e51473bc
Merge pull request #1642 from ether/fix/import
...
Fix #1639 by removing bodyParser middleware introduced with swagger REST...
2013-03-18 14:12:09 -07:00
Marcel Klehr
2bc45de106
Fix #1639 by removing bodyParser middleware introduced with swagger REST API
2013-03-18 22:09:47 +01:00
John McLear
fb9d46fc51
document the required tests
2013-03-18 20:08:58 +00:00
John McLear
3562672a75
stop start point going negative
2013-03-18 18:44:01 +00:00
John McLear
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
John McLear
9f54a65c88
refactored arrow keys now work after paste in chrome
2013-03-18 17:40:18 +00:00