libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity
3033 commits 207 branches 105 tags 124 MiB
Commit graph

1192 commits

Author SHA1 Message Date
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
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
Siebrand Mazeland
35e4891217 Localisation updates from http://translatewiki.net. 2013-03-23 13:26:38 +00:00
John McLear
0063933041 fix cookies 2013-03-23 02:59:12 +00: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
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
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
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
7741f762e2 hook for chat msg 2013-03-19 02:21:53 +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
Marcel Klehr
2bc45de106 Fix #1639 by removing bodyParser middleware introduced with swagger REST API 2013-03-18 22:09:47 +01: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
Siebrand Mazeland
83ed9303da Localisation updates from http://translatewiki.net. 2013-03-18 00:43:57 +00:00
John McLear
3e0a80cb74 remove console log 2013-03-17 15:17:36 +00:00
John McLear
693b9b9b94 better mobile support for gritter messages, before it was awful 2013-03-17 01:23:31 +00:00
John McLear
a1d9d27cde much cleaner way of showing / hiding overlay 2013-03-16 17:57:23 +00:00
John McLear
69a4ab76cf hide modal once reconnect is good 2013-03-16 17:50:53 +00:00
John McLear
13ad46aa67 a safer approach I think but still be careful 2013-03-16 13:19:12 +00:00
Marcel Klehr
cd9c78998e Fix path.join in Settings.js 2013-03-16 09:47:10 +01:00
Marcel Klehr
54433db47f release v1.2.9 2013-03-15 21:43:29 +01:00
Marcel Klehr
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
Marcel Klehr
de552df6db Fix clearing authorship colors which was broken by #1609 
Fixes #1620
 2013-03-15 18:08:51 +01:00
John McLear
cf041dcb08 Merge pull request #1618 from ether/tidy-up 
Tidy up
 2013-03-14 14:32:13 -07:00
John McLear
5d12be940c return text instead of html 2013-03-14 18:28:35 -03:00
John McLear
383439629a specialkey doesnt even exist afaik 2013-03-14 18:27:32 -03:00
John McLear
1bb9d1d625 remove pointless + 2013-03-14 18:23:27 -03:00
John McLear
d72abceee7 escape .color 2013-03-14 18:18:14 -03:00
John McLear
f0dee2d2ce Merge pull request #1615 from ether/fix/admin-relative-links 
redirect /admin to /admin/ so that the relative links work
 2013-03-14 08:01:11 -07:00
John McLear
ac9b972358 Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg 2013-03-14 12:01:09 -03:00
Marcel Klehr
5fe60e7221 redirect /admin to /admin/ so that the relative links work 2013-03-14 15:59:39 +01:00
John McLear
10231db103 Merge pull request #1609 from ether/dont-crash-bad-author 
SECURITY PATCH: Don't crash pad if bad author data is passed to the server
 2013-03-13 16:08:21 -07:00
Marcel Klehr
c30b0b72b8 Validate all 'author' attribs of incoming changesets to be the same value as the current user's authorId 2013-03-13 22:23:35 +01:00
John McLear
babb33d825 add authorId to chat and userlist, possibly privacy/security issue? 2013-03-13 21:55:29 +01:00
John McLear
83a820b720 new function for handling custom messages, allows objects to be sent, before we only allowed strings 2013-03-12 16:59:15 +00:00
Siebrand Mazeland
acb4b4ebaf Localisation updates from http://translatewiki.net. 2013-03-11 04:52:12 +00:00
John McLear
26a6765b50 fix indent on chrome in linux 2013-03-08 08:40:40 -08:00
John McLear
0b16d96c97 Merge pull request #1527 from nelsonsilva/swagger 
Initial work on new swagger based REST API
 2013-03-07 08:07:46 -08:00
Jordan Hollinger
3cafa24982 Fix variable name typo in PadMessageHandler.padUsers 2013-03-07 09:37:03 -05:00
John McLear
0c9214bb27 bump v and changelog 2013-03-06 15:08:27 +00:00
John McLear
1e94eaa06c fix safari rtl dissapearing pad 2013-03-06 14:50:08 +00:00
Marcel Klehr
5731ef7802 Fix ace rtlIsTrue property setter 2013-03-06 15:40:02 +01:00
John McLear
2a8038b9fe Merge pull request #1593 from marcelklehr/feature/rtl-pad-setting 
Add a setting for RTL text direction (integrating the url paramter)
 2013-03-06 05:58:47 -08:00
nelson.silva
a5987285e0 Multiple REST endpoints (one per version) 2013-03-06 10:10:21 +00:00
Nelson Silva
8f279a6710 Added some fixes to make it work with the codegen 2013-03-06 10:10:21 +00:00
Nelson Silva
1cfc8eda19 Initial work on swagger 2013-03-06 10:10:21 +00:00
Marcel Klehr
760e1b82c3 Add a setting for RTL text direction (integrating the url paramter) 
Fixes #1191
 2013-03-05 23:12:00 +01:00
John McLear
f9f8b1c079 allow chrome to do control z type functionality, not sure why this was never in.. broken when we last updated jQ anyway 2013-03-05 20:30:31 +00:00
Manuel Knitza
67a0730710 added nodemailer to package.json - fix #1586 2013-03-05 21:28:38 +01:00
John McLear
3dee4098b0 update ueberdb 2013-03-05 13:24:24 +00:00
Siebrand Mazeland
6c304f0480 Localisation updates from http://translatewiki.net. 2013-03-04 11:46:05 +00:00
John McLear
71f10bff5b Merge pull request #1568 from ether/client-stability 
stop the client disconnecting of the server sends out a bad revision #, ...
 2013-03-03 13:19:10 -08:00
Marcel Klehr
c4966543ed Fix settings object having constructors of another vm.context 
This made it impossible to rely on `instanceof` to work as expected on (even parts of) the settings object
Fixes #1570
 2013-02-28 16:16:26 +01:00
John McLear
994c4ebeed stop the client disconnecting of the server sends out a bad revision #, this is very dangerous, the server really shouldn't be sending the same rev #, we could really do with some strong tests case that cover this. Either way this commit 'resolves' #1510 2013-02-27 19:29:59 +00:00
John McLear
ebd8b85072 patch documented here https://github.com/ether/etherpad-lite/issues/472 adds some stability but not a perfect solution 2013-02-27 16:17:50 +00:00
John McLear
18b6cf1534 Merge pull request #1523 from ether/store-sessions-in-db 
Store sessions in db
 2013-02-26 18:03:54 -08:00
John McLear
2c69066591 remove pointless stuff 2013-02-27 02:02:18 +00:00
John McLear
ad52b40597 post correct url, heh 2013-02-26 13:24:24 +00:00
John McLear
b2eb1b3814 post url with pad error msg 2013-02-26 13:14:17 +00:00
John McLear
f915285f15 merge develop 2013-02-25 10:13:50 +00:00
John McLear
5b89242c5b Merge pull request #1538 from ether/timeslider-init-hook 
timeslider init hook
 2013-02-25 02:12:37 -08:00
Siebrand Mazeland
26ccb1fa3e Localisation updates from http://translatewiki.net. 2013-02-24 16:38:27 +00:00
John McLear
4a98ec3c23 resolve merge conflict 2013-02-20 22:37:27 +00:00
John McLear
fb3e4a6232 only show clients on this pad resolves issue #1544 2013-02-20 16:10:27 +00:00
John McLear
e52dc2b17c dont reset head count, use the one we should :) 2013-02-19 02:05:51 +00:00
John McLear
9eff8576ef timeslider init hook 2013-02-18 22:04:58 +00:00
John McLear
cda3a0e78b a different approach 2013-02-18 21:03:52 +00:00
John McLear
c986a8565a Merge pull request #1535 from ether/fix-extractPadData 
fix extract and checkPad
 2013-02-18 12:41:46 -08:00
Marcel Klehr
4592397bd9 Merge pull request #1491 from ether/export-txt-with-indent 
TXT Export Indentation on lists Edit
 2013-02-18 12:13:06 -08:00
John McLear
ab81b5cfe9 dont jump pages 2013-02-18 19:46:31 +00:00
John McLear
5441179e78 dont jump pages 2013-02-18 19:38:25 +00:00
John McLear
1a177d730a Merge pull request #1536 from ether/timeslider-scripts-block 
Timeslider scripts block
 2013-02-18 11:34:53 -08:00
John McLear
e7a07a495c Merge pull request #1531 from ether/fix-for-long-strings 
make the focus jump back to the left if it's required
 2013-02-18 11:26:46 -08:00
John McLear
2ee3d0469e Merge pull request #1533 from ether/indenting-text 
Indenting text
 2013-02-18 11:25:55 -08:00
John McLear
7fcc71710f dont exposrt sendSocketMs 2013-02-18 18:59:53 +00:00
John McLear
75fd27998e expose socket timeslider with a bad hack 2013-02-18 18:58:58 +00:00
John McLear
3f87a32a12 timestlider script block 2013-02-18 18:07:01 +00:00
John McLear
4cfac2f624 fix extract and checkPad 2013-02-18 08:29:25 -08:00
John McLear
77d03d3473 Try to add some sanity to indentation 2013-02-18 01:40:34 +00:00
John McLear
48ffbde731 allow colon to indent line 2013-02-18 01:10:54 +00:00
John McLear
eeeeb04840 remove cruft 2013-02-18 00:37:47 +00:00
John McLear
6e46a53288 this is probably bad, please sanity check 2013-02-18 00:36:31 +00:00
John McLear
11a8295150 eureka 2013-02-18 00:29:53 +00:00