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

3162 Commits (a62593e9a08f0d84eae6945e6e669d37149076f7)

Author SHA1 Message Date
John McLear 12a2da2884 attempting to get right client authorid sent with changeset 2013-04-07 18:40:55 +01:00
Siebrand Mazeland 555be31eab Localisation updates from http://translatewiki.net. 2013-04-07 17:11:22 +00:00
John McLear 85c68b1f51 rewrite author to actual author on changes 2013-04-07 16:28:28 +01:00
Siebrand Mazeland 5b1de1421c Localisation updates from http://translatewiki.net. 2013-04-07 10:36:57 +00:00
John McLear 069319fda1 Merge branch 'release/1.2.91' 2013-04-06 14:40:02 +01: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 883be3d48d begin by adding some template css 2013-04-05 02:21:56 +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
Bernard `Guyzmo` Pratz 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
Bernard `Guyzmo` Pratz 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
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
Guyzmo 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
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