John McLear
|
bf93500214
|
some polish for a turd
|
2013-04-08 19:50:52 +01:00 |
|
John McLear
|
946289c221
|
temp patch for 1652
|
2013-04-08 19:46:45 +01:00 |
|
John McLear
|
99dff9c4e5
|
Merge pull request #1720 from ether/remove-draggable
remove draggable which was used for dragging users in the userbox
|
2013-04-08 10:05:31 -07:00 |
|
John McLear
|
7728d5b321
|
remove draggable which was used for dragging users in the userbox
|
2013-04-08 17:23:03 +01:00 |
|
John McLear
|
12bc98af7e
|
Merge pull request #1716 from ether/only-redraw-existing-lines
only try to redraw the line height of lines that exist..
|
2013-04-08 08:44:48 -07:00 |
|
John McLear
|
d8eb0ba7ea
|
Merge pull request #1718 from ether/fix/plugins-multi-install
pluginfw/installer: Only restart the server when all tasks have finished
|
2013-04-08 08:05:29 -07:00 |
|
Marcel Klehr
|
324b9b1f5f
|
pluginfw/installer: Only restart the server when all tasks have finished
fixes #1685
|
2013-04-08 16:14:03 +02:00 |
|
John McLear
|
3cdb8131ce
|
Actually update windows download link
Need to remember to do this on release..
|
2013-04-08 03:43:34 +02:00 |
|
John McLear
|
f135f79d13
|
only try to redraw the line height of lines that exist..
|
2013-04-07 19:06:15 +01:00 |
|
Siebrand Mazeland
|
555be31eab
|
Localisation updates from http://translatewiki.net.
|
2013-04-07 17:11:22 +00:00 |
|
Siebrand Mazeland
|
5b1de1421c
|
Localisation updates from http://translatewiki.net.
|
2013-04-07 10:36:57 +00:00 |
|
John McLear
|
7492fb18a4
|
version bump
|
2013-04-06 14:29:21 +01:00 |
|
John McLear
|
288cfb0dc5
|
Merge pull request #1712 from goldquest/dev_imp-browser-detect-fix
import broken / missing browser detection. fixes #1695
|
2013-04-05 14:04:08 -07:00 |
|
goldquest
|
cbf0535f97
|
browser detection was dropped in jquery 1.9, so we have to add the browser detection js file
|
2013-04-05 15:35:03 +02:00 |
|
Marcel Klehr
|
38f54057a0
|
Merge pull request #1711 from ether/fix/two-part-locales
html10n.js: Finally fix two-part locale specs
|
2013-04-05 05:20:44 -07:00 |
|
Marcel Klehr
|
402a4b7b3e
|
html10n.js: Finally fix two-part locale specs
fixes #1706
|
2013-04-05 14:18:46 +02:00 |
|
John McLear
|
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 |
|
John McLear
|
6dc4ddd29e
|
no need for the language string on that div
|
2013-04-05 03:38:47 +01:00 |
|
John McLear
|
7805e83b7f
|
Merge pull request #1705 from ether/ctrl-s-top
dont use top, use the scheduler
|
2013-04-04 11:02:40 -07:00 |
|
John McLear
|
38f7253d31
|
Merge pull request #1704 from ether/readme2
Updated README, it's about time we let go.
|
2013-04-04 11:02:27 -07:00 |
|
John McLear
|
5fb5b6c7af
|
Linux clarity
|
2013-04-04 18:23:56 +01:00 |
|
John McLear
|
43f8778241
|
hrm, maybe this makes sense to a wider audience
|
2013-04-04 15:35:19 +01:00 |
|
John McLear
|
380821781f
|
dont use top, use the scheduler
|
2013-04-04 02:25: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 |
|