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-01-22 15:26:14 +01:00
Code Issues Projects Releases Wiki Activity
4105 commits 206 branches 105 tags 124 MiB
Commit graph

1945 commits

Author SHA1 Message Date
dummys
8278ef3c7c added log4js 0.6.6 2013-06-13 15:10:32 +02:00
Kyle Kelley
82de797642 Only kept URL schemes which have an RFC standard 2013-06-12 12:31:38 -05:00
Kyle Kelley
b4f155c028 Cleanup gophers 2013-06-12 11:20:36 -05:00
Siebrand Mazeland
4c264aec4d Localisation updates from http://translatewiki.net. 2013-06-10 08:45:19 +00:00
Chia-liang Kao
548f31a46a new hook: aceSetAuthorStyle 2013-06-06 13:03:40 +08:00
Chia-liang Kao
eae9faa28c refactor setAuthorStyle 2013-06-06 12:30:48 +08:00
goldquest
7528ddf610 typo 2013-05-29 16:54:39 +02:00
goldquest
121c02c74f Grant access, when valid session is available and sessionNoPassword is set 2013-05-29 16:53:14 +02:00
Siebrand Mazeland
7d81a6d042 Localisation updates from http://translatewiki.net. 2013-05-26 09:36:03 +00:00
Siebrand Mazeland
9c69753a35 Localisation updates from http://translatewiki.net. 2013-05-20 09:30:23 +00:00
Siebrand Mazeland
8ee15d4003 Localisation updates from http://translatewiki.net. 2013-05-12 18:40:40 +00:00
Siebrand Mazeland
923c01745b Localisation updates from http://translatewiki.net. 2013-05-09 13:39:04 +00:00
Marcel Klehr
90d1598688 Merge pull request #1751 from goldquest/dev_IE8-fix 
Fixing IE8 errors
 2013-05-08 07:19:15 -07:00
John McLear
2273cf9ed6 Merge pull request #1740 from ether/feature/add-cs-queue 
add a changeset queue
 2013-04-28 13:58:08 -07:00
John McLear
9f2bab2ba3 Merge pull request #1760 from bemeric1/develop 
Issue #1652: Fix to client-side-induced changeset spamming.
 2013-04-28 13:11:34 -07:00
Siebrand Mazeland
702a300164 Localisation updates from http://translatewiki.net. 2013-04-28 17:48:19 +00:00
Marcel Klehr
2c855de6f6 Add a server-side changeset queue per pad 
fixes #1573
 2013-04-27 23:04:42 +02:00
Brian Emerick
e7d8f124ad Issue #1625: Fix to client-side-induced changeset spamming. 
THE BUG - HIGH LEVEL:
- When client A sends out an attribute change, client B applies that change to itself but
  also thinks that it made the change itself, which is incorrect. This means that when client B
  next makes a change, he will send out that he made the attrib change that A actually made.
- Ex: Have 2 clients on the same pad. Have A apply bold on some text. Next, have B type a character.
  B will broadcast that it both added a character AND applied bold, when in reality it did NOT
  apply bold at all, that change was done by the other client and this client incorrectly adopted it as its own.
- This root bug behavior results in clients continuing to think that they each made the other client's change,
  thus resulting in an infinite loop of changeset spamming that bogs down clients and harms server stability.

THE BUG - IN DEPTH:
- The root issue is in the way that Changesets are combined in Changeset.follow(). Specifically, in the case of a
  changeset with ONLY new attrib changes (no text changes) being merged with an identity changeset (has no ops).
- In this case, Changeset.follow() copies the ops of the new CS and fully overrides the other CS.
- applyChangesToBase invokes Changeset.follow to determine the final client document CS state after applying the new CS.
  If the final client document CS state is NOT the identity CS, then the client broadcasts that it made a change.
- When client A changes just attribs, client B's applyChangesToBase calls Changeset.follow() and passes client A's
  changeset (attrib change) and Client B's current changeset state (identity).
- As per the noted bug, Changeset.follow() returns client A's changeset as a result, causing client B to adopt
  client A's changeset as its own document state. Thus, client A ends up thinking it has made client B's changes.

THE FIX:
- Changeset.follow() should NOT copy the ops of the new CS passed in if those changes are only attrib changes.
  This allows applyChangesToBase to properly set the client's CS back to the identity after applying an
  external attrib change, instead of incorrectly adopting the external client's changes.
 2013-04-24 15:18:25 -07:00
Spruce (Felix Fichte)
fb0bc31056 updated to use settings 
updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
 2013-04-24 12:19:41 +02:00
spruce
6ea5efbcc3 Update SocketIORouter.js 
Changed the setting of client.remoteAddress
 2013-04-22 23:01:41 +03:00
Siebrand Mazeland
f0f98b41fe Localisation updates from http://translatewiki.net. 2013-04-21 12:29:25 +00:00
John McLear
bf4c86ed94 better message for admins 2013-04-17 23:48:11 +01:00
John McLear
63b00b9010 Merge branch 'feature/add-cs-queue' of github.com:ether/etherpad-lite into dont-crash-noauth 2013-04-17 20:04:25 +01:00
John McLear
3b8621c6a0 dont crash on no auth, ust a bandaid 2013-04-17 19:50:05 +01:00
goldquest
98c43aff43 fixed spacing 2013-04-17 18:17:14 +02:00
John McLear
f478f99995 Merge pull request #1750 from ether/fix/authorship-once-and-4-all 
Fix authorship sanitization
 2013-04-17 08:13:22 -07:00
goldquest
896f72311f use document, not doc 2013-04-17 16:51:54 +02:00
goldquest
566034ddf0 IE8 don't knows the Array.forEach function (simple version fix) 2013-04-17 16:51:43 +02:00
goldquest
b08a6e522f IE8 complains, if catch block is missing 2013-04-17 16:51:21 +02:00
Marcel Klehr
146c75e703 Remove console.log in content collector 
fixes #1731
 2013-04-17 16:37:45 +03:00
Marcel Klehr
560fd55bf2 Fix authorship sanitization 
author colors wouldn't get disttributed, if their id was greater than 9
(due to apool encoding them to base 36)
 2013-04-17 15:24:40 +02:00
Marcel Klehr
cd288c70cb Don't block changeset queue with delivering changeset 2013-04-17 14:26:11 +02:00
Marcel Klehr
1c8b7a3661 Add a server-side changeset queue per pad 
fixes #1573
 2013-04-17 14:25:23 +02:00
John McLear
e7a80b7b77 still express is stuck at 3.1.0 2013-04-16 00:12:11 +01:00
cohitre
602380abb7 passing the ToolbarItem to the callback 2013-04-15 16:06:32 -07:00
John McLear
f987299a5d catch error on export 2013-04-15 23:01:08 +01:00
cohitre
0c52fb5e30 Normalizing how select and button commands are triggered. 2013-04-15 11:32:59 -07:00
Marcel Klehr
76e50e2c4d Refactor SocketIORouter 2013-04-15 20:29:06 +02:00
John McLear
9b952da692 Merge branch 'develop' of github.com:ether/etherpad-lite into update-connect 2013-04-15 19:07:01 +01:00
John McLear
9a863824c9 update connect and express 2013-04-15 19:06:22 +01:00
John McLear
4989f56673 undo avoid changeset spam as it breaks functionality 2013-04-15 14:36:25 +01:00
John McLear
2c8699506d push express back as it breaks sessions 2013-04-15 12:21:10 +01:00
John McLear
c3c7a3d128 Merge pull request #1721 from ether/dont-send-same-cs-spam 
temp patch for #1652
 2013-04-15 04:20:05 -07:00
Siebrand Mazeland
8a2977381f Localisation updates from http://translatewiki.net. 2013-04-14 11:54:26 +00:00
cohitre
90837437c5 Moving the toolbar plugin calls. 2013-04-13 12:06:51 -07:00
John McLear
08b54ef61b Merge pull request #1732 from ether/authorID-2 
Correct authorID in Changeset on modification
 2013-04-12 06:36:39 -07:00
John McLear
337179fddd remove console logs and cruft 2013-04-12 14:34:07 +01:00
Marcel Klehr
f4de7f6a90 Use a string instead of an array! 2013-04-11 21:23:38 +02:00
Marcel Klehr
49013b18c7 We need to replace all new author attribs with thisSession.author, in case someone copy/pasted or otherwise inserted other peoples changes 2013-04-11 21:12:59 +02:00
Marcel Klehr
e8d953a15c Use the correct version number 2013-04-11 19:08:07 +03:00
John McLear
f9d23767f8 Merge pull request #1709 from ether/keep-list-order-on-paste 
When you paste into a numbered list, keep some integrity
 2013-04-11 09:07:22 -07:00
John McLear
a81a40d75b Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-04-11 17:05:24 +01:00
John McLear
f4123d2904 bump v and readme 2013-04-11 17:04:54 +01:00
John McLear
dc6e2e13fe Merge pull request #1723 from ether/expose-broadcastslider 
expose broadcast slider so plugins can interact with it
 2013-04-11 09:03:43 -07:00
Marcel Klehr
594757cc47 html10n.js: Don't break in getDirection if language hasn't been set 
fixes #1724
 2013-04-11 18:51:49 +03:00
John McLear
9581097dc7 remove cruft 2013-04-11 16:39:25 +01:00
John McLear
1fc906017c final css 2013-04-11 16:38:41 +01:00
John McLear
e712f7665d working solution props to dmitryu for making me not be scared of modifying div clases 2013-04-11 16:33:03 +01:00
Marcel Klehr
c755633f09 Update html10n.js to correctly use the console.log shim 
fixes #1724
 2013-04-10 17:56:09 +02:00
John McLear
4a5e63f105 Merge pull request #1693 from guyzmo/api_extension 
extension of the API (versioned 1.2.8)
 2013-04-09 14:49:11 -07:00
John McLear
9dfac79107 no need to declare var twice 2013-04-09 15:58:18 +01:00
John McLear
8836981e32 expose broadcast slider so plugins can interact with it 2013-04-09 15:55:14 +01:00
John McLear
90c5b26e89 keep integrity on paste and better styling but new lists dont reset counter 2013-04-09 14:29:55 +01:00
John McLear
2e76bd4e50 working but then create a second list, it will be stupid, SIGH 2013-04-09 01:22:09 +01:00
John McLear
7885c410b5 Merge branch 'develop' of github.com:ether/etherpad-lite into keep-list-order-on-paste 2013-04-09 00:52:04 +01:00
John McLear
bfa233ba04 kudos to quenenni for some working CSS 2013-04-09 00:46:13 +01:00
John McLear
70a25964b6 make sure elements are supported, still doesn't assign numbers properly 2013-04-08 23:32:04 +01:00
John McLear
49cff88a48 semi working 2013-04-08 23:03:19 +01:00
John McLear
7098ba49f3 Merge pull request #1722 from mluto/remove-top-console-log-in-collab-client 
use `parent.parent` instead of `top` in `collab_client.js`
 2013-04-08 14:09:36 -07:00
mluto
dfc49df52d use parent.parent instead of top in collab_client.js, since top breaks embedding when a pad is embedded (same origin policy) 2013-04-08 22:58:34 +02:00
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
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
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
f135f79d13 only try to redraw the line height of lines that exist.. 2013-04-07 19:06:15 +01:00
John McLear
ffc8f61a2f remove cruft 2013-04-07 18:44:13 +01:00
John McLear
6c47e29e07 restore PMH original 2013-04-07 18:43:49 +01:00
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
7492fb18a4 version bump 2013-04-06 14:29:21 +01: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
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
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
380821781f dont use top, use the scheduler 2013-04-04 02:25:19 +01: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
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
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
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
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
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
6a5e5cb6fd Merge pull request #1640 from ether/caret-refactor 
Caret refactor - I need help with tests...
 2013-03-30 09:21:35 -07:00
Manuel Knitza
358b07390e fix "util.pump() is deprecated. Use readableStream.pipe()" 
fix error introduced by b3988e3
 2013-03-30 15:42:10 +01:00
mluto
6af160ee56 Fix #1519: don't error in listSessionsOfGroup when there are non-existing sessions (by eldiddio) 2013-03-29 10:09:39 +01:00
John McLear
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
John McLear
c67c7ca746 remove messy bits 2013-03-29 03:09:10 +00:00
John McLear
406ff8e6f8 Merge pull request #1681 from ether/loading_block 
Loading blocks
 2013-03-28 20:01:46 -07:00
John McLear
d73ea4e334 Loading blocks 2013-03-29 02:24:15 +00:00
Marcel Klehr
0ff5137da3 Make revision button glow on ctrl-s and increase duration 2013-03-28 16:39:33 +01:00
John McLear
59a9ff404d more settimeout to top window 2013-03-28 13:18:55 +00:00
John McLear
c489177206 show light yellow for .5 secs on save revision keypress 2013-03-28 02:24:59 +00:00
John McLear
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
John McLear
09b32ea694 Merge pull request #1672 from ether/feature/admin-plugins-revamp 
/admin/plugins revamp
 2013-03-27 12:05:00 -07:00
John McLear
2abb993e8b Merge pull request #1607 from ether/custom-obj-msg 
Custom Object messages
 2013-03-27 11:50:56 -07:00
John McLear
40cbe55507 Update en.json 2013-03-27 14:11:20 +00:00
Marcel Klehr
cbee50d42d /admin/plugins: Display a tooltip when hovering the plugin details link 2013-03-27 12:28:54 +01:00
Marcel Klehr
bc8d6d4c45 /admin/plugins: Add a loading indicator to some messages 2013-03-27 12:20:50 +01:00
Marcel Klehr
c4d9a71156 /admin/plugins: Fix update check 2013-03-27 12:02:19 +01:00
Marcel Klehr
ac0018cdfa Don't leak event listeners for process:uncaughtException 2013-03-26 21:19:09 +01:00
John McLear
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
Marcel Klehr
d01a209cbf /admin/plugins: Dry up displaying of info messages 2013-03-26 21:04:21 +01:00
Marcel Klehr
76c879bb47 /admin/plugins: Fix for smaller screens 2013-03-26 20:41:24 +01:00
Marcel Klehr
806926d0f6 /admin/plugins: If a user installs sth scroll up to the loading indicator 2013-03-26 19:54:23 +01:00
Marcel Klehr
4edb3b7ab3 /admin/plugins: Fix infinite scroll for larger screens 2013-03-26 19:32:15 +01:00
Marcel Klehr
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
Marcel Klehr
f75a839cd0 Remove plugin prefix in pluin lists and make links to plugins more clear 2013-03-26 18:39:46 +01:00
Marcel Klehr
7edfff7574 /admin/plugins: Show some text if nothing is display otherwise 2013-03-26 16:23:47 +01:00
Marcel Klehr
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
Marcel Klehr
981a33f01e pluginfw/installer.js fire callbacks only once 2013-03-26 14:40:19 +01:00
Marcel Klehr
aca5d150e4 /admin/plugins: Don't list installed plugins as available 2013-03-26 11:58:31 +01:00
Marcel Klehr
511407241a /admin/plugins: Make it display the same amount of plugins after sorting 2013-03-26 11:38:51 +01:00
Marcel Klehr
5d7a8adcb7 Silence npm when using npm.commands.search 2013-03-26 11:33:04 +01:00
Marcel Klehr
9109bd206e Catch all errors in pluginfw/installer.js 2013-03-26 11:20:12 +01:00
Marcel Klehr
e8bae61cf5 /admin/plugins: Add progress indicators and report errors 2013-03-26 11:19:36 +01:00
John McLear
6b55d13370 expose ace document, reqjired for various plugins 2013-03-26 01:54:01 +00:00
Marcel Klehr
b35d9c14fd /admin/plugins:Hide ep_etherpad-lite in the list of installed plugins 2013-03-25 23:52:10 +01:00
Marcel Klehr
773293991b admin/plugins: Allow people to sort search results 2013-03-25 23:09:03 +01:00
Marcel Klehr
1ebbcd2f30 Don't leak event listeners in pluginfw/installer.js 
fixes #921
 2013-03-25 17:22:51 +01:00
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
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
ffe7e65db6 allow strict transport if ssl is on and stop x-frame-options, this might break embedded pads, please test 2013-03-14 19:03:20 -03: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
cohitre
988653b8ce Toolbar hooks 2013-03-12 19:36:04 -07: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
cohitre
52aa7d3997 Registering commands on the ace toolbar 2013-03-10 15:42:12 -07:00
cohitre
292a3bd7b7 Setting up the right toolbar. 2013-03-09 14:57:42 -08: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
cohitre
c57bc444cd basic toolbar setup 2013-03-03 16:06:14 -08: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
John McLear
6d7e709ecb Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db 2013-02-17 23:44:26 +00:00
John McLear
51a9ecf1f0 better support for other browsers 2013-02-17 21:19:15 +00:00
John McLear
7e023ce8e1 make the focus jump back to the left if it's required 2013-02-17 21:03:19 +00:00
Marcel Klehr
9ca2275432 Fixes #1498: Two-part locale specs in lang cookie wouldn't be read correctly 2013-02-17 21:35:46 +01:00
John McLear
04f609752f actually works 2013-02-17 18:05:25 +00:00
John McLear
6b47fb69d0 seems to be working pretty well 2013-02-17 18:01:25 +00:00
John McLear
93d58b93be Update src/static/css/iframe_editor.css 2013-02-17 17:13:02 +00:00
Siebrand Mazeland
025a3aa724 Localisation updates from http://translatewiki.net. 2013-02-16 05:10:29 +00:00
John McLear
140ff6f1bf dont lose focus on key up, doesn't work yet 2013-02-15 12:24:16 +00:00
John McLear
7c03bc2610 when exporting HTML include html and body 2013-02-14 01:13:23 +00:00
John McLear
c723aefdfe when exporting HTML include html and body 2013-02-14 01:10:47 +00:00
John McLear
36814ed42b apply overlay and remove overlay instantly 2013-02-13 23:44:20 +00:00
John McLear
7f09ec25a2 no need for prefix and tidy double semi 2013-02-13 21:53:15 +00:00
John McLear
efce99c3a1 session key in settings file OR generate temp key for instance 2013-02-13 21:51:09 +00:00
John McLear
aefd8d8d0d nice chars n no cruft 2013-02-13 18:45:45 +00:00
John McLear
dea892213e Revert "allow non ascii chars in txt export" 
This reverts commit be56272e66.
 2013-02-13 18:41:04 +00:00
John McLear
be56272e66 allow non ascii chars in txt export 2013-02-13 18:30:55 +00:00
John McLear
d3f730e2ba fix various issues dont stop random *'s appearing 2013-02-13 18:01:15 +00:00
Mark Fisher
500f9b8b48 Fixed typo thats made server hang 2013-02-13 15:25:27 +00:00
Marcel Klehr
602d603658 Merge pull request #1512 from disy-mk/patch-3 
Allow people to query current API version via /api
 2013-02-13 03:39:32 -08:00
John McLear
a4e5adab3e Update Ueber DB to fix MySQL Bug! 2013-02-13 02:47:24 +00:00
John McLear
5c9d081391 Begin supporting the database but still have a problem where it generates new key on restart... 2013-02-13 01:33:22 +00:00
John McLear
198110eb4b drunk comments 2013-02-12 23:49:43 +00:00
John McLear
e152c477c7 include the callback call, for sanity and stop the pad from being nuked so early in the function 2013-02-12 23:38:02 +00:00
John McLear
086132de66 dont die on bad html but only warn to api logger but dont tell client that it failed cause html was bad 2013-02-12 23:23:44 +00:00
Manuel Knitza
8c9ad6ee50 Update src/node/handler/APIHandler.js 2013-02-12 21:50:14 +01:00
Manuel Knitza
e855bafdf9 Update src/node/hooks/express/apicalls.js 2013-02-12 21:47:40 +01:00
John McLear
da246d183d Correct license header 2013-02-12 19:47:53 +00:00
John McLear
0b5c948549 Move code from Html export to a Helper file 2013-02-12 19:45:46 +00:00
John McLear
14dca92692 Merge pull request #1505 from ether/fix-for-long-strings 
very simple fix that might break other things but stops the caret focus ...
 2013-02-12 11:06:45 -08:00
John McLear
760bebc429 Merge pull request #1507 from ether/ace2_inner-fix 
fix issue where opera was doing stupid things but still an issue w/ doub...
 2013-02-12 11:06:25 -08:00
John McLear
a37d396577 fix issue where opera was doing stupid things but still an issue w/ double tabs exists 2013-02-12 19:04:43 +00:00
John McLear
9c54f024aa Bump to latest ueber to support sqlite 2013-02-12 13:15:57 +00:00
John McLear
2f20461445 a comment 2013-02-12 00:13:47 +00:00
John McLear
5f73a5ec30 very simple fix that might break other things but stops the caret focus being moved to the end of new lines when a long string without spaces is pasted into a pad 2013-02-12 00:08:44 +00:00
John McLear
24485283fd Merge pull request #1504 from ether/feature/bringJqueryBack 
Checked JQuery back in. Temporary fix for #1499
 2013-02-11 14:05:31 -08:00
Peter 'Pita' Martischka
b76e49ecde Checked JQuery back in. Temporary fix for #1499 2013-02-11 21:22:16 +00:00
Peter 'Pita' Martischka
0953a5ac33 Brought scheduler back completly, fixes #1502 2013-02-11 20:51:40 +00:00
Manuel Knitza
b1586684c8 Explicitly log creation of pad 2013-02-11 03:03:18 +01:00
John McLear
60ef5f210a remove duplicate code to the best of my ability right now 2013-02-10 23:41:14 +00:00
John McLear
1a77e57503 Merge pull request #1487 from ether/dep-cleanup 
Dependancy cleanup
 2013-02-10 15:19:20 -08:00
Peter 'Pita' Martischka
17a02bb024 Merge branch 'develop' of github.com:ether/etherpad-lite into dep-cleanup 2013-02-10 22:41:49 +00:00
Peter 'Pita' Martischka
b0f555e669 Revert "no longer dep on npm as it's native" 
This reverts commit 85f18d1f92.
 2013-02-10 22:26:39 +00:00
John McLear
28f6d50011 remove console warn 2013-02-10 22:14:05 +00:00
Peter 'Pita' Martischka
25fd3c5901 Windows and Mobile tests should be case insensitive 2013-02-10 22:10:25 +00:00
Peter 'Pita' Martischka
8d8487dfa6 Made jquery browser usable in testframework 2013-02-10 21:49:00 +00:00
John McLear
bd33061c8a Merge pull request #1492 from ether/feature/cleanup 
Several code cleanups
 2013-02-10 13:38:26 -08:00
Peter 'Pita' Martischka
1fbd408e82 replaced opera regex check with jquery browser check 2013-02-10 21:21:22 +00:00
Peter 'Pita' Martischka
500c451ba1 removed hack, because its uncessary now that scheduler is back 2013-02-10 21:19:48 +00:00
John McLear
d7992a1366 begin putting files together for a release 2013-02-10 21:13:51 +00:00
Peter 'Pita' Martischka
5e041aaedb Moved old jquery recognition to seperate file 2013-02-10 20:34:27 +00:00
Peter 'Pita' Martischka
60de52477c jquery shouldn't be checked in 2013-02-10 20:14:13 +00:00
John McLear
bcf9c23b4e dont use HTML filter hooks on txt export 2013-02-10 19:38:16 +00:00
John McLear
626ee97669 kinda brutal way of stopping plugins being able to pass *s instead of attributes 2013-02-10 19:36:46 +00:00
John McLear
a67a0950dd stop urls being encoded, not sure about other security implications here... 2013-02-10 19:21:27 +00:00
Siebrand Mazeland
5248dac016 Localisation updates from http://translatewiki.net. 2013-02-10 19:15:11 +00:00
John McLear
69a6d5468e a bit fairer 2013-02-10 17:53:17 +00:00
John McLear
a378f48c00 remove console warns 2013-02-10 17:39:02 +00:00
John McLear
d16b15f3eb begin support for better txt output 2013-02-10 17:34:34 +00:00
Marcel Klehr
6d2b1488d6 Reformat access log messages to improve readability 2013-02-10 16:14:48 +01:00
John McLear
3760b97170 Merge pull request #1489 from marcelklehr/feature/log-client-ips 
Log the client ip on pad access
 2013-02-10 07:09:56 -08:00
Marcel Klehr
ee89696c4d Log the client ip on pad access with logger 'access' 
also, don't log every message with log level info!
 2013-02-10 16:03:49 +01:00
John McLear
2634e8120a Merge pull request #1485 from ether/readme-placeholder 
remove one less warning during install by having a readme placeholder
 2013-02-10 05:59:33 -08:00
Marcel Klehr
6191b01633 Merge pull request #1477 from ether/fix-opera-double-enter 
Fixes #940: opera double enter
 2013-02-10 05:10:38 -08:00
John McLear
85f18d1f92 no longer dep on npm as it's native 2013-02-10 03:39:20 +00:00
John McLear
f617cefe54 no need for jshint and update wd 2013-02-10 03:30:08 +00:00
John McLear
8f2025067b remove one less warning during install by having a readme placeholder 2013-02-10 03:04:08 +00:00
John McLear
98d45af0f9 Merge pull request #1484 from disy-mk/develop 
jquery update 1.7.1 -> 1.9.1
 2013-02-09 18:18:40 -08:00
Manuel Knitza
7b3d567d0c .browser() support 
Code appended to support use of .browser() (which is deprecated as of jquery 1.3 and was removed with v.1.9.0)
 2013-02-10 02:53:07 +01:00
John McLear
cd77f3e637 Merge pull request #1483 from 0ip/ua 
Add UA functions
 2013-02-09 17:47:34 -08:00
Manuel Knitza
7389e90cd0 update jquery 1.7.1 -> 1.9.1 2013-02-10 02:37:17 +01:00
0ip
c3a29d1480 Add missing export entry for the browser object 2013-02-09 22:35:10 +01:00
0ip
7ddfdc3935 Add UA functions 2013-02-09 22:26:47 +01:00
0ip
8a6b3c90e2 Fix loader styling 2013-02-09 21:29:11 +01:00
0ip
8fb8f0d3b6 Change settings layout 2013-02-09 21:22:23 +01:00
0ip
40734e6776 Fix table CSS 2013-02-09 20:58:57 +01:00
0ip
ad54369bf1 Add doctype 2013-02-09 20:57:41 +01:00
John McLear
a45a8a837d stop opera doing stupid things 2013-02-09 19:44:13 +00:00
0ip
21e1422be6 Drop 'lite' occurrences in /admin/* 2013-02-09 20:42:47 +01:00
0ip
52ff28dea0 Fix data attribute 2013-02-09 20:34:12 +01:00
0ip
d2409288be Add data-title for responsive tables 2013-02-09 20:15:41 +01:00
0ip
34fd7726bd Fix :admin/index links 2013-02-09 17:55:11 +01:00
0ip
b04e99bddc Tweak admin-UI 2013-02-09 17:54:39 +01:00
0ip
dd29096ad7 Normalize view-ports 2013-02-09 17:47:52 +01:00
John McLear
a93ff37879 fix opera by recreating a scheduler object 2013-02-09 16:42:47 +00:00
0ip
ef0a6ce5ff Remove top-border 2013-02-09 17:39:08 +01:00
Marcel Klehr
5f79546c2a Merge pull request #1465 from mluto/kill-ep-stuff 
Removing old etherpad code
 2013-02-08 13:21:57 -08:00
mluto
f2cd9e3adc Removed sidebar-code since the sidebar got removed in EPL, there is only the stickychat which is not affected by this. 2013-02-08 22:06:28 +01:00
mluto
e6454af5ed Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP 2013-02-08 22:00:17 +01:00
mluto
fc60ab24fa Removed debug code, moved hash-setting after the param-checking 2013-02-07 15:34:10 +01:00
mluto
0d5b98a338 Removed isProPad, since all pads are public except for group-pads 2013-02-07 14:30:09 +01:00
mluto
0cbd4034b1 Killed pad_docbar.js as it's from the old etherpad and not used 2013-02-07 13:59:41 +01:00
mluto
6e8dcee650 Removed old chat-code 2013-02-07 11:15:16 +01:00
John McLear
e78879c300 Merge pull request #1461 from ether/slider-nan 
stop slider showing NaN on tiny pads
 2013-02-06 15:45:39 -08:00
John McLear
488ebc20a4 Merge pull request #1446 from ether/allow-plugins-to-specify-specs 
Allow plugins to specify specs
 2013-02-06 15:43:39 -08:00
John McLear
284748adb7 stop slider showing NaN on tiny pads 2013-02-06 23:35:58 +00:00
John McLear
adaded343d better fix for IE8 page up down 2013-02-06 20:09:30 +00:00
root
9fcabfa8ac fix IE8 styling y u no do this 0ip? 2013-02-06 20:02:24 +00:00
John McLear
dd49c71af9 fixes IE8 error by only redifining if firefox 2013-02-06 19:43:28 +00:00
John McLear
5b31030958 Merge pull request #1454 from dmitryuv/feature/socketio-rooms 
socket.io rooms instead of own session management
 2013-02-05 16:09:25 -08:00
Dmitry
34f9f15150 socket.io rooms instead of own session management 
Replaces homegrown pad session management with socket.io build-in rooms
 2013-02-05 23:33:44 +04:00
Jordan Hollinger
718421a46d Bugfixes to getChatHistory API method 2013-02-04 00:57:51 -05:00
John McLear
da0b331502 Make async and cleaner 2013-02-04 00:00:39 +00:00
Peter 'Pita' Martischka
eaa835630c Support Page Up and Page Down in ace 2013-02-03 17:39:49 +00:00
Peter 'Pita' Martischka
cba001341f Remove legacy mozilla specific code from ace inner 2013-02-03 14:03:10 +00:00
John McLear
8b8cf01785 put tests in static folder, still have a race condition no biggy 2013-02-03 13:53:44 +00:00
Peter 'Pita' Martischka
d30daccb10 Don't handle selections that are not from the inner frame 2013-02-03 13:44:37 +00:00
John McLear
0ff9f53297 correct path 2013-02-03 00:18:24 +00:00
John McLear
594d272334 allow plugins to specify frontend test specs 2013-02-03 00:14:17 +00:00
Manuel Knitza
b9b5ebf661 Update src/static/js/html10n.js 
Added missing semicolons (#1440)
 2013-02-01 21:28:22 +01:00
John McLear
f8cc7e0d7b Merge pull request #1438 from mluto/plugin-search-case-senstive 
Made plugin search not casesensitive
 2013-01-31 10:13:37 -08:00
mluto
037478cbcd Made plugin search not casesensitive 2013-01-31 19:05:23 +01:00
Swen
360d5c150b Update html code to proper validate 2013-01-30 20:24:48 +01:00
Swen
7f5579c2ed Reverted change 2013-01-30 20:21:21 +01:00
Swen
1f348d911f Merge branch 'develop' into admin-index-plugable 2013-01-30 20:16:51 +01:00
Swen
621a410750 Merge remote-tracking branch 'ether_origin/develop' into develop 2013-01-30 20:08:53 +01:00
John McLear
594d53ee8b changelog and package file 2013-01-30 14:58:23 +00:00
John McLear
037ca9b3fd Merge pull request #1432 from mluto/rename-save-revision 
Renamed "Saved Revisions" to "Save Revision"
 2013-01-30 06:47:10 -08:00
mluto
d669779eb8 Renamed "Saved Revisions" to "Save Revision" since it saves a revision.. 2013-01-30 15:45:48 +01:00
John McLear
1814c756ad Merge pull request #1431 from mluto/fix-userinfo-crash 
Fix USERINFO_UPDATE crash
 2013-01-30 06:43:37 -08:00
John McLear
5b285e2ffa Merge pull request #1430 from mluto/notification-on-startup 
Don't show notifications when loading the chat-messages.
 2013-01-30 06:33:47 -08:00
mluto
7e48e025c7 Check for missing payload on CLIENT_MESSAGE 2013-01-30 15:28:54 +01:00
mluto
f2742c5b63 Check for missing userInfo 2013-01-30 15:21:25 +01:00
mluto
b5eeeb7dc2 Don't show notifications when loading the chat-messages. 2013-01-30 12:16:32 +01:00
John McLear
edd8b12049 push authorID to author object and return via api... 2013-01-29 16:45:09 +00:00
John McLear
daaa650a1b remove message about requiring comments 2013-01-29 12:15:11 +00:00
John McLear
a7361f5ce0 make tinycon update on all chat messages not just ones that mention your name 2013-01-29 12:09:16 +00:00
John McLear
fa7952523e spacing 2013-01-29 02:08:37 +00:00
John McLear
1c7810783c gritter now implemented 2013-01-29 01:55:36 +00:00
John McLear
2ae3dae492 introduce gritter files and ensure its available 2013-01-29 00:46:36 +00:00
John McLear
c6f997981b Merge pull request #1417 from ether/diff-view 
Adds an API endpoint for Diff view
 2013-01-28 13:50:31 -08:00
John McLear
e1cd34763d Merge pull request #1418 from mluto/timeslider-jump-revisions 
Jump to revisions in timeslider
 2013-01-28 13:29:47 -08:00
mluto
01fe5c183d Only set url if the revsion will actually be loaded 2013-01-28 21:44:21 +01:00
Marcel Klehr
dcff3bddda Merge pull request #1413 from mluto/clean-getParams 
Rewrote getParams() to be more dynamic and shorter
 2013-01-28 12:03:31 -08:00
mluto
a239158b49 Renamed paramSettings to getParameters, to cause less confusion 2013-01-28 20:17:34 +01:00
John McLear
51eff0d659 change to createDiffHTML 2013-01-28 16:53:29 +00:00
John McLear
4378561882 change to createDiffHTML 2013-01-28 16:52:23 +00:00
mluto
f974136d0c Jump to revision given in URL, add current revision to URL 2013-01-28 10:13:37 +01:00
spcsser
80333d8e0a Added ability to add menu entries for admin pages. 2013-01-27 23:02:27 +01:00
Siebrand Mazeland
75b861e93b Localisation updates from http://translatewiki.net. 2013-01-27 19:41:00 +00:00
John McLear
3fac18f88a resolve merge conflict 2013-01-27 17:54:26 +00:00
John McLear
ed5644d4e5 docs 2013-01-27 17:51:40 +00:00
Peter 'Pita' Martischka
878fd7631c Fixed HTML export 2013-01-27 17:25:50 +00:00
Peter 'Pita' Martischka
07a267be7a Added colors to pad diff 2013-01-27 16:45:09 +00:00
Peter 'Pita' Martischka
dcfb1b2ea4 Added missing functions to create pad diffs 2013-01-27 15:40:37 +00:00
Peter 'Pita' Martischka
f4690dda9d fixed indent 2013-01-27 15:40:05 +00:00
mluto
7432b7aff9 Rewrote getParams() to be more dynamic and shorter 2013-01-27 11:02:15 +01:00
John McLear
e811037300 Merge pull request #1411 from ether/feature/plugin-update-checker 
plugin update checker
 2013-01-26 13:36:11 -08:00
Marcel Klehr
541aeb3a98 /admin/plugins: Display an update button for all plugins that are outdated 2013-01-26 22:15:19 +01:00
Marcel Klehr
0549a4fec7 Add checkUpdates endpoinnt for /admin/plugins 2013-01-26 22:13:28 +01:00
John McLear
1290fa36c3 typo fix 2013-01-26 20:05:37 +00:00
John McLear
9d0672c1c8 not a perfect css fix but stops the overflow when screen is less than 1000px 2013-01-26 20:04:33 +00:00
John McLear
090508909e Merge pull request #1389 from ether/disconnect-eejs-block 
add eejs block for disconnect
 2013-01-26 09:06:53 -08:00
John McLear
0ccd1a30e9 Merge pull request #1390 from ether/html-head-block-eejs 
add a html block eejs so you can add a cache manifest
 2013-01-26 09:06:38 -08:00
John McLear
51daaf02ce Merge pull request #1407 from mluto/hardcoded-i18n 
i10ze hardcoded message, update some messages on lang-change
 2013-01-26 07:19:04 -08:00
mluto
cb2b93b133 Added getChatHistory and getChatHead (api+code+doc) 2013-01-26 14:35:26 +01:00
mluto
046fac9fa9 Added a comment to clearify *why* this works 2013-01-25 20:38:24 +01:00
mluto
763864539f Use 'html10n' instead of '_', i10nzed "unnamed author(s)" 2013-01-25 17:41:33 +01:00
mluto
4a20a26cbf Merge branch 'develop' of https://github.com/ether/etherpad-lite into hardcoded-i18n 2013-01-25 17:14:56 +01:00
mluto
509f564cd7 re-formated onelined en.json 2013-01-25 17:06:57 +01:00
Marcel Klehr
2841bfc009 Merge branch 'feature/real-time-plugin-search' into develop 2013-01-25 14:50:51 +01:00
mluto
7812d93e74 Fixed "unnamed" and "enter your name" in userlist 2013-01-25 10:32:09 +01:00
John McLear
568b641ee9 Merge pull request #1404 from ether/feature/real-time-plugin-search 
real-time plugin search
 2013-01-24 14:09:30 -08:00
Marcel Klehr
3e793b8a63 [/admin/plugins] remove progress history 2013-01-24 23:00:56 +01:00
Marcel Klehr
23dd4c73e2 pluginfw/installer.js: Don't freak out users with cryptic errors, just use the error message 2013-01-24 22:40:31 +01:00
Marcel Klehr
fa55cd4759 [/admin/plugins] Add real-time on keypress search 
also, I reduced the size of the activity indicator
 2013-01-24 22:39:52 +01:00
John McLear
1f7140345a index wrapper block 2013-01-24 20:03:07 +00:00
John McLear
ccc06b08ee Merge pull request #1402 from marcelklehr/feature/uniform-admin-menu 
Add a unified menu to all admin pages
 2013-01-24 10:00:58 -08:00
Marcel Klehr
7c06dc750c Unify admin page titles 2013-01-24 18:46:32 +01:00
Marcel Klehr
2eccaa2afd Add a uniform menu to all admin pages 2013-01-24 18:46:15 +01:00
John McLear
569fb8d3c8 silly little bug now resolved 2013-01-24 16:48:40 +00:00
John McLear
18b96b33c6 Merge pull request #1379 from ether/more-plugin-details 
resolve #1349 - add url to plugin name
 2013-01-24 07:29:30 -08:00
Marcel Klehr
3719ce7c5d [admin] Make links prettier 2013-01-24 13:50:49 +01:00
Marcel Klehr
9fa5b9506e Add links for installed plugins 2013-01-24 13:43:42 +01:00
John McLear
28aa1ecc24 Merge pull request #1398 from marcelklehr/fix/html10n-ie8-array.indexOf 
Fix Array.prototype.indexOf for IE8! <3
 2013-01-23 08:49:15 -08:00
Marcel Klehr
25e1ed2d0c Fix Array.prototype.indexOf for IE8! <3 2013-01-23 17:40:10 +01:00
goldquest
74185e79ab use the existing padimpexp object from the parent window 2013-01-23 16:36:37 +01:00
John McLear
9129c6970a add a html block eejs so you can add a cache manifest 2013-01-23 02:46:57 +00:00
John McLear
b76f084f3a add eejs block for disconnect 2013-01-23 01:01:35 +00:00
John McLear
f1b9c213ee and semi working 2013-01-22 23:37:53 +00:00
John McLear
3fb2f02875 semi working 2013-01-22 23:16:49 +00:00
John McLear
d21585b880 mheh 2013-01-22 23:06:52 +00:00
John McLear
205d983225 make it crash 2013-01-22 22:48:05 +00:00
John McLear
5d416579ee bring in some padDiff stuff that doesnt suck 2013-01-22 22:33:51 +00:00
John McLear
6ae46ea8e3 fix issue where url was wrong for install 2013-01-22 18:28:38 +00:00
John McLear
159feceb20 fix import without params 2013-01-22 18:17:15 +00:00
John McLear
c6882aa65a Merge pull request #1386 from ether/fix-import-on-params 
fix issue #1369 where params would break import
 2013-01-22 08:05:04 -08:00
John McLear
e23108d199 fix issue #1369 where params would break import 2013-01-22 16:03:00 +00:00
goldquest
666c0adcd2 script tag didn't link to right location 2013-01-22 16:42:56 +01:00
Siebrand Mazeland
7869a543dd Localisation updates from http://translatewiki.net. 2013-01-22 06:14:31 +00:00
John McLear
441dd3785a fix issue #1110 2013-01-20 23:11:59 +00:00
John McLear
8bfa8a7e73 better urls 2013-01-20 22:42:32 +00:00
John McLear
4cbf3869c6 open in external window 2013-01-20 22:36:58 +00:00
John McLear
1bf526124d resolve #1349 2013-01-20 22:34:27 +00:00
John McLear
4b5d993f0d bump v and create CHANGELOG 2013-01-20 13:45:16 +00:00
John McLear
b282547dbf Merge pull request #1376 from t-8ch/patch-2 
listAllPads needs findKeys from ueberDB 0.1.9
 2013-01-20 05:42:44 -08:00
John McLear
0a06b07f7d Merge pull request #1377 from mluto/add-users-block 
Added a template block for #users
 2013-01-20 05:35:19 -08:00
mluto
9c364d7d38 Added a template block for #users 2013-01-20 13:56:51 +01:00
Thomas Weißschuh
9ee5098ad6 listAllPads needs findKeys from ueberDB 0.1.9 2013-01-19 19:17:52 +00:00
Jordan Hollinger
858d8e6e71 listAllPads should return an object, not an arraay. issue #1374 2013-01-18 11:13:03 -05:00
John McLear
96989e63c7 prepare for release 2013-01-18 13:30:46 +00:00
Marcel Klehr
a1188c15c0 [html10n] Fix onload event listener (must be attached to window!) 2013-01-16 19:47:54 +01:00
mluto
e31b9fd1bd IE8 does not have a string.trim()-function, so use regex.. 2013-01-16 18:48:25 +01:00
John McLear
5eb09f981b Merge pull request #1358 from mluto/clientvars-hook 
Make the creation of clientVars hookable
 2013-01-14 14:26:30 -08:00
John McLear
bb9097e528 Merge pull request #1355 from mluto/chat-no-empty-line 
prevent empty chat-messages from being sent
 2013-01-14 14:25:46 -08:00
mluto
27c5498c54 Require ueberDB 0.1.9, not 0.1.8; this is needed for findKeys 2013-01-14 23:22:12 +01:00
mluto
41cb5d8265 Added hook for clientVars and hook-doc 2013-01-14 22:51:26 +01:00
mluto
94f9b05c4c Only create clientVars when they are needed 2013-01-14 22:08:33 +01:00
Swen
96b7b5e8d0 Removed unnecessary return statement 2013-01-14 21:12:40 +01:00
John McLear
654654b4e1 Merge pull request #1342 from spcsser/feature/padlisting 
API & backend to list pads on epl instance
 2013-01-14 08:13:57 -08:00
mluto
77401f2759 prevent empty chat-messages from being sent 2013-01-14 17:11:56 +01:00
John McLear
1e7bcdba59 more sensible timeslider blocks.. 2013-01-14 03:42:09 +00:00
John McLear
33e0ec2097 Merge pull request #1334 from mluto/load-more-chat-messages 
Load more than 100 chat messages using a 'load more'-link
 2013-01-13 10:31:45 -08:00
John McLear
6104987a4b Merge pull request #1353 from ether/feature/log4js-config-setting 
Add log4js config setting
 2013-01-13 10:28:15 -08:00
John McLear
0bcfef5aa4 Merge pull request #1352 from ether/timeslider-eejs 
add a body eejs block to timeslider
 2013-01-13 10:27:50 -08:00
John McLear
eb0338d40c better shindig 2013-01-13 18:23:35 +00:00
Siebrand Mazeland
f8d6ffa22a Localisation updates from http://translatewiki.net. 2013-01-13 15:01:03 +00:00
Marcel Klehr
f4b95c5ca4 Add log4js config setting 2013-01-13 12:20:49 +01:00
John McLear
e137919c3d add a body eejs block to timeslider 2013-01-12 23:51:35 +00:00
0ip
2786807f2f Fix broken relative paths 
Bug introduced in 53521c8732
 2013-01-12 18:41:56 +01:00
spcsser
9687ecbb82 Modified pad list manager to return an ordered list. 2013-01-11 18:31:53 +01:00
Swen
e9726890a4 Edited getPads function to be able to work without callback 2013-01-11 04:43:59 +01:00
John McLear
730266256c fix #1341 by adding css to stop highlighting 2013-01-10 15:14:10 +00:00
Marcel Klehr
7a62661705 Merge pull request #1346 from ether/fix-timeslider-date-not-changing 
fix #1345: timeslider time delta
 2013-01-10 04:50:12 -08:00
John McLear
ac448937ab fix egils fix of time delta resolves #1345 2013-01-10 00:01:38 +00:00
Swen
c9f137b2e5 Added functionality to use spcsser/ueberDB findKey functionality. 2013-01-09 20:45:39 +01:00
Swen
7a49c82e16 Added comments 2013-01-08 20:21:14 +01:00
Swen
8c3263a6ea Added comments 2013-01-08 20:19:10 +01:00
Swen
198754222d Added functionality to list pads on this server. 2013-01-08 20:14:01 +01:00
John McLear
fadfa6772e changelog and package file 2013-01-07 19:31:29 +00:00
Marcel Klehr
e6d523ba1c Merge pull request #1317 from ether/enter-on-plugins 
/admin/plugins: stop enter reloading new page on search result request
 2013-01-07 10:46:05 -08:00
Oscar Perez
f00dddd09c Moved console existence check before the variable is used. This was causing a crash in Internet Explorer when the console was not enabled (console is off by default). 2013-01-07 13:24:40 -05:00
mluto
bc05f9eb0a converted load-more-link to button, added loading-gif, fixed typo 2013-01-07 19:15:55 +01:00
mluto
825b258d99 only load 20 messages when pressing the load-link, fixed whitespace 2013-01-07 17:43:03 +01:00
mluto
5f81daed0a Added link to load more chat-messages using new GET_CHAT_MESSAGES 2013-01-07 17:36:03 +01:00
John McLear
8e366da82e use .val() instead of [0] 2013-01-07 11:27:40 +00:00
Siebrand Mazeland
1782c68d4d Localisation updates from http://translatewiki.net. 2013-01-07 10:18:02 +00:00
John McLear
44981e8907 Merge pull request #1331 from mluto/fix-locales 
Fixed broken placeholders in locales
 2013-01-06 12:03:34 -08:00
mluto
c57ecf06ca fixed broken placeholders in locales 2013-01-06 18:50:52 +01:00
mluto
5592c4b0fe client loads messages using the new client loads messages using new method, getChatMessages restructured and renamed to getLastChatMessages, added GET_CHAT_MESSAGES, getChatMessages restructured and renamed to getLastChatMessages 2013-01-06 16:11:48 +01:00
mluto
9484b92ae2 fixed and unified indenting, added comments in handleClientReady 2013-01-06 14:55:33 +01:00
mluto
77315aa1d4 Load CSS before JS, in timeslider 2013-01-06 12:26:00 +01:00
mluto
c56c7b8ca9 Load CSS before JS 
According to google this is more efficent
https://developers.google.com/speed/docs/best-practices/rtt?hl=en#PutSty
lesBeforeScripts
 2013-01-06 12:19:56 +01:00
Stephan Jauernick
9f9f7a627e corrected a documentation glitch for checkToken - clarified which token is validated 2013-01-02 15:14:46 +01:00
John McLear
c370f779cc stop enter reloading new page on search result request 2013-01-02 14:01:39 +00:00
Marcel Klehr
53459fe160 release v1.2.3 2012-12-31 15:57:16 +01:00
Marcel Klehr
b6c9b4ec30 Fix #1309 : Fix support for node v0.6 2012-12-31 15:47:42 +01:00
John McLear
d9ef9f5648 Merge pull request #1308 from marcelklehr/fix/console-log-html10n-chrome 
Fix #1307: Chrome needs console.log to be called on console obj
 2012-12-30 06:50:21 -08:00
Siebrand Mazeland
f894d9b8f4 Localisation updates from http://translatewiki.net. 2012-12-30 10:31:57 +00:00
Marcel Klehr
ba6e0d2a05 Fix #1307: Chrome needs console.log to be called on console obj 2012-12-30 10:56:31 +01:00
Marcel Klehr
ffc9bcf028 Bump API version for checkToken endpoint 2012-12-27 22:09:22 +01:00
John McLear
b681359dfa bump version # in package and update CHANGELOG 2012-12-27 20:09:14 +00:00
Marcel Klehr
369e24682b Merge pull request #1297 from marcelklehr/migrate-to-html10n 
Migrate to html10n and allow plugin l10n
 2012-12-27 07:56:41 -08:00
John McLear
746396951d Resolve #1301 startup pointing at old bitly URL 2012-12-26 00:17:43 +00:00
Marcel Klehr
220e084484 Simplify local locale file format 2012-12-23 22:43:32 +01:00
Marcel Klehr
d84951cd04 Remove locale file converter (ini2json) 2012-12-23 18:31:59 +01:00
Marcel Klehr
2055a2b176 [l10n] Convert all ini files to json 2012-12-23 18:23:56 +01:00
Marcel Klehr
fefbdb6fe1 Add direction info 2012-12-23 18:17:25 +01:00
Marcel Klehr
fdf6628cc5 Fix html attr translation 2012-12-23 18:17:23 +01:00
Marcel Klehr
04b65a0b4e Add support for three-letter lang codes 2012-12-23 18:17:21 +01:00
Marcel Klehr
0c9178d392 Fix html10n usage in code that wouldn't allow lang switching 2012-12-23 18:17:19 +01:00
Marcel Klehr
580d936e50 Fix lang pre-selection of lang picker 
(would break in cases when html10n might not have loaded yet)
 2012-12-23 18:17:17 +01:00
Marcel Klehr
23b7469df6 [html10n] Don't expose lang code, if the language is not available 2012-12-23 18:17:14 +01:00
Marcel Klehr
7aba02f0cf Don't break if a plugin hasn't got a locales dir 2012-12-23 18:17:12 +01:00
Marcel Klehr
cf24e53eae Simplify server-side i18n code and make it a bit more understandable 2012-12-23 18:17:10 +01:00
Marcel Klehr
4a489f85f6 Fix translations in timeslider template 2012-12-23 18:17:08 +01:00
Marcel Klehr
f68adc8553 Fix translations in timeslider code 2012-12-23 18:17:05 +01:00
Marcel Klehr
e34036513e There's no utf8, but there's utf-8 2012-12-23 18:17:03 +01:00
Marcel Klehr
3c3c1630b1 Revert "Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it!" 
This reverts commit 5fb7a03fb34078a75fe5932563e5a9fe44c57015.
 2012-12-23 18:17:01 +01:00
Marcel Klehr
00d7ebc646 Allow html10n to handle import paths relative to the importing file 2012-12-23 18:16:59 +01:00
Iván Eixarch
9d459687af fixed bug in parseIni 2012-12-23 18:16:56 +01:00
Iván Eixarch
bc0d9c854b use relativa path in import definitions of locales.json 2012-12-23 18:16:54 +01:00
Marcel Klehr
d9d0312a9e Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it! 
(As if we wouldn't look forward to that...)
 2012-12-23 18:16:52 +01:00
Marcel Klehr
51f6ac6b71 Fix lang picker, again 2012-12-23 18:16:50 +01:00
Marcel Klehr
a2b2257851 Fix html10n cache and lang fallback 2012-12-23 18:16:48 +01:00
Marcel Klehr
e3f9ed37b4 Hacky solution for exploreDir error 
We should only traverse the directories of actual plugins instead
of traversing the whole node_modules folder
 2012-12-23 18:16:45 +01:00
Marcel Klehr
f4f2c1d9ab Fix lang picker 2012-12-23 18:16:43 +01:00
Marcel Klehr
64b176f4de Fix html10n (finally) 2012-12-23 18:16:41 +01:00
Marcel Klehr
67c893aaca Fix html10n and the locale resource <link>s 2012-12-23 18:16:39 +01:00
Iván Eixarch
2b860986e8 support for json in i18n 2012-12-23 18:16:37 +01:00
Iván Eixarch
1f4a171f10 convert language files from ini to json 2012-12-23 18:16:35 +01:00
Marcel Klehr
6446281254 Migrate lang picker and embed param to html10n.js 2012-12-23 18:16:32 +01:00
Iván Eixarch
754467782f convert language files from ini to json 2012-12-23 18:16:22 +01:00
Iván Eixarch
f72ec3eb28 convert language files from ini to json 2012-12-23 18:16:19 +01:00
Marcel Klehr
25be9b8c93 Add kick-off code for client-side l10n 2012-12-23 18:16:17 +01:00
Marcel Klehr
edacb3e2ca Update html10n.js 2012-12-23 18:16:15 +01:00
Marcel Klehr
53521c8732 Replace webL10n with html10n.js 2012-12-23 18:16:13 +01:00
Siebrand Mazeland
f0b613aa57 Localisation updates from http://translatewiki.net. 2012-12-21 18:45:56 +00:00
Siebrand Mazeland
fd848c30fd Localisation updates from http://translatewiki.net. 2012-12-16 22:01:37 +00:00
Siebrand Mazeland
48b1eb1aa9 Localisation updates from http://translatewiki.net. 2012-12-16 19:17:25 +00:00
John McLear
a5965bcdb5 Merge pull request #1244 from Wikinaut/add-socketio-transport-protocol-parameter 
add socketTransportProtocols parameter
 2012-12-10 15:15:05 -08:00
Wikinaut
05e8c74307 removed console.log of transport protocols 2012-12-10 22:33:00 +01:00
John McLear
bf5283fa11 Fix issue #725 which was caused by a race condition 2012-12-10 11:34:53 +00:00
John McLear
f1ca9bb456 Merge pull request #1272 from stephan48/patch-1 
Added a checkToken Method for checking the Validity of the API Token
 2012-12-10 01:17:11 -08:00
Iván Eixarch
ff8b4b6b20 change key of message sucessfull on import 2012-12-09 17:34:32 +01:00
Iván Eixarch
0371d5ba9e Remove async load of l10n.js because Chrome fail to translate 2012-12-09 09:41:30 +01:00
Iván Eixarch
9f1872afc1 use properties notation 2012-12-09 08:56:58 +01:00
Iván Eixarch
854ed56037 Merge remote branch 'ether/develop' into jstranslate 2012-12-09 08:43:19 +01:00
Siebrand Mazeland
25125c30c3 Localisation updates from http://translatewiki.net. 2012-12-08 18:47:42 +00:00
Wikinaut
5a4c8e2a4a Merge remote-tracking branch 'upstream/develop' into add-socketio-transport-protocol-parameter 2012-12-08 03:04:48 +01:00
Marcel Klehr
45b1e3eacb Merge pull request #1249 from leblanc-simon/develop 
Fix author colors in chat
 2012-12-07 05:59:28 -08:00
Stephan Jauernick
4318d210ce Update src/node/db/API.js 
Corrected function documentation.
 2012-12-07 11:28:03 +01:00
Stephan Jauernick
26ece95905 Update src/node/db/API.js 
Added a missing symicolon and removed the padID argument which is not passed(and thus leads to an errors because the callback lands in there).
 2012-12-07 11:28:03 +01:00
Stephan Jauernick
2163c8be5c Update src/node/handler/APIHandler.js 
Added the checkToken function to the function array.
 2012-12-07 11:28:03 +01:00
Stephan Jauernick
8686da87e8 Update src/node/db/API.js 
Added a checkToken method for checking if the API token is valid.
 2012-12-07 11:28:03 +01:00
Wikinaut
5bf79971b8 merged upstream develop 2012-12-07 08:59:13 +01:00
Iván Eixarch
b01903202c Added new strings to translate for js files 2012-12-07 05:24:40 +01:00
John McLear
98e03c1d87 Merge pull request #1268 from ether/fix/eejs-block-caching 
Fix #1247, #1201: Don't cache eejs blocks!
 2012-12-06 12:13:39 -08:00
Marcel Klehr
c909ed256f Fix #1247, #1201: Don't cache eejs blocks! 
Caching eejs blocks led to many unexpected bugs
like having to restart the server after installing new plugins
or the legendary connectingbar.gif issue...
 2012-12-06 18:35:35 +01:00
goldquest
1380fda2b2 use the parent window, not the top 2012-12-06 17:51:43 +01:00
Iván Eixarch
1a5035ae6b reverse old change 2012-12-06 11:53:58 +01:00
Iván Eixarch
bf04a4686a avoid use of os.tmpDir() for node 0.6 compatibility 2012-12-06 11:49:04 +01:00
Iván Eixarch
f9b6d9f122 Merge remote branch 'ether/develop' into develop 2012-12-06 11:22:05 +01:00
goldquest
7631096135 fix for multiple cookies support (Also fix for, when session is not valid anymore) 2012-12-06 02:01:38 +01:00
goldquest
4ce16b526e Added semicolons 2012-12-06 02:00:58 +01:00
John McLear
6b3917cde7 Merge pull request #1257 from marcelklehr/fix/api-if-requireAuth 
Fix #1219: Make api work if requireAuth is enabled
 2012-12-05 07:27:59 -08:00
Marcel Klehr
b5af643969 Merge pull request #1259 from GuillaumeAmat/fixes/import-file-input-size 
Reduce the file input's width in the import popup to prevent overflow
 2012-12-05 06:14:05 -08:00
Guillaume AMAT
c853f8fad2 Reduces the width of the file input to prevent overflow in the import popup 2012-12-05 15:02:32 +01:00
Marcel Klehr
fe89a367cc Fix #1226: Chrome would load async js 2012-12-05 14:16:44 +01:00
Marcel Klehr
2f37afac66 Merge pull request #1255 from 0ip/feature/show-pl-version 
Display plugin version numbers in /admin/plugins
 2012-12-05 05:09:20 -08:00
Marcel Klehr
377ff1eade Fix #1219: Make api work if requireAuth is enabled 2012-12-05 14:04:48 +01:00
0ip
8d0ef88baf Adjust select width 
looks better :)
 2012-12-05 12:55:48 +01:00
0ip
20f13bc8ce Add comment to explain how the property containing the version is being read 2012-12-04 19:08:25 +01:00
0ip
1fc5519c86 Display plugin versions 2012-12-04 14:30:30 +01:00
Iván Eixarch
a2b22652ce added direction language in English 2012-12-04 13:02:23 +01:00
Iván Eixarch
5f949b8457 Update language4translatewiki 0.1.3 2012-12-04 12:12:58 +01:00
Iván Eixarch
b21c4403b2 Merge remote branch 'ether/develop' into languages4translatewiki 2012-12-04 11:40:17 +01:00
John McLear
55d543f9ca Merge pull request #1221 from ether/focus-on-password 
proper fix for focus and some styling of the form and allows for pressin...
 2012-12-03 06:35:16 -08:00
John McLear
1e8d954560 best I can do with this temporary fix for IE 2012-12-03 14:28:25 +00:00
John McLear
b3e55f64a8 stop password being clearly visible 2012-12-03 13:10:32 +00:00
John McLear
0b92fdfc62 fix IE auth but only a temp fix 2012-12-03 12:47:11 +00:00
Marcel Klehr
17fb60e483 Merge pull request #1248 from ether/improved-search 
Improve plugin search

uses modules descriptions too now, bit more cpu heavy, but that's okay
 2012-12-03 04:14:15 -08:00
John McLear
d09894ce77 make it show password dialog on wrong password 2012-12-03 12:05:11 +00:00
John McLear
4843840d72 last JS fix 2012-12-03 11:44:30 +00:00
John McLear
b0463bd7d5 whoopsi 2012-12-03 11:41:51 +00:00
John McLear
bef25b40f8 Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password 2012-12-03 11:37:01 +00:00
root
84d154b168 Update strings, add UK strings, fix JS 2012-12-03 11:35:06 +00:00
Simon Leblanc
38b14c40f0 Add same color in pad and chat for author 2012-12-03 03:43:56 +01:00
John McLear
b5c263dd37 improve search to use description too, bit more cpu heavy for thats okay 2012-12-03 01:41:01 +00:00
Iván Eixarch
657322db91 fixed git merge confict 2012-12-03 01:39:59 +01:00
John McLear
8a9045b335 remove ssl not enabled message 2012-12-02 18:33:31 +00:00
Wikinaut
0d2eddb62a console.debug socketTransportProtocols 2012-12-02 18:54:30 +01:00
Wikinaut
9224e9beef removed wrong comment in Settings.js 2012-12-02 18:44:39 +01:00
Wikinaut
8b044254cc add socketTransportProtocols parameter 2012-12-02 18:28:28 +01:00
John McLear
a74defdab7 Merge branch 'focus-on-password' of github.com:ether/etherpad-lite into focus-on-password 2012-12-02 17:07:23 +00:00
John McLear
c9a5e55654 Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password 2012-12-02 17:06:33 +00:00
root
3cdf66c2f7 first effort to move into templates but javascript is broken so dont pull 2012-12-02 17:03:56 +00:00
Siebrand Mazeland
e9e4d65ad4 Localisation updates from http://translatewiki.net. 2012-12-02 12:35:02 +00:00
Iván Eixarch
b0b64358f9 Merge remote branch 'ether/develop' into develop 2012-12-02 05:57:14 +01:00
Niklas Laxström
d4b79a6cba Localisation updates from http://translatewiki.net. 2012-12-01 11:32:26 +00:00
John McLear
3dcbd8dd4e fix the control S to save a revision 2012-11-30 23:28:34 +00:00
John McLear
a4c4d11cd4 fix letter s... 2012-11-30 15:26:51 -08:00
John McLear
d761003588 fix path to favicon resolves #1236 2012-11-30 22:50:54 +00:00
Marcel Klehr
ab148ebc1a Merge pull request #1229 from ether/control-s 
catch control S and send an event to save a revision -- fixes #1128
 2012-11-29 08:57:10 -08:00
John McLear
53d6d0813e Merge pull request #1233 from marcelklehr/fix/s.io-perf-with-modern-browsers 
Let socket.io decide which transport is best for the browser
 2012-11-29 06:55:51 -08:00
Marcel Klehr
719fb7e045 Let socket.io decide which transport is best for the browser 2012-11-29 13:42:37 +01:00
Iván Eixarch
795a20b3f2 get languages availables through translatewiki API 2012-11-28 23:54:23 +01:00
John McLear
93e9d7c852 remove control S comment 2012-11-28 17:20:58 +00:00
John McLear
8c7939ec9f catch control S and send an event to save a revision 2012-11-28 17:17:35 +00:00
Iván Eixarch
9ec8a6e3d3 back to globalize... don't work :S 2012-11-28 04:02:55 +01:00
Iván Eixarch
1cc0e8cbf0 Restore original ini file 2012-11-28 03:27:09 +01:00
Iván Eixarch
523c7aebe5 Merge remote branch 'ether/develop' into develop 2012-11-28 03:13:04 +01:00
John McLear
c445197e7f Update src/static/css/pad.css 2012-11-27 15:10:36 +00:00
Iván Eixarch
97d77ea089 added my name in header 2012-11-27 00:11:45 +01:00
Iván Eixarch
6fe6103632 added languages for translatewiki 2012-11-26 23:40:31 +01:00
Iván Eixarch
7280376a26 Merge with ether develop 2012-11-26 22:11:31 +01:00
John McLear
f880473360 remember the styling for the pasword prompt 2012-11-26 20:54:28 +00:00
John McLear
fddca354b3 proper fix for focus and some styling of the form and allows for pressing enter on form so generally a better fix 2012-11-26 20:52:10 +00:00
John McLear
b66c9135f7 Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on-wrap 2012-11-26 20:20:21 +00:00
John McLear
6239c66e36 remove alert on line wrap as it doesnt mean anything 2012-11-26 20:19:27 +00:00
John McLear
491bf515c6 Merge pull request #1199 from leblanc-simon/develop 
improving the translation of the timeline
 2012-11-26 11:48:08 -08:00
Wikinaut
a49bab5dae fix timeslider rightstep button position 2012-11-26 08:54:13 +01:00
Iván Eixarch
d7cca602df Added message translatable about features importing without abiword 2012-11-26 03:18:47 +01:00
Iván Eixarch
460200981e Merge remote branch 'ether/develop' 2012-11-26 02:21:18 +01:00
Niklas Laxström
de5a90b9c7 Localisation updates from http://translatewiki.net. 2012-11-25 12:52:08 +00:00
John McLear
fdf0b1a384 Merge pull request #1202 from Wikinaut/fix-1148-add-native-node-https-support 
Fix 1148 add native node https support
 2012-11-24 16:35:02 -08:00
Iván Eixarch
6d5907562d Fixed installed plugins section in plugins/info 2012-11-24 03:18:22 +01:00
Iván Eixarch
8ac49477f9 Fix 1203: non-escaped html in plugins info 2012-11-24 00:42:44 +01:00
Iván Eixarch
ef7590fb73 Fix 1203: non-escaped html in plugins info 2012-11-24 00:26:48 +01:00
Iván Eixarch
0250f8d55c Merge remote branch 'ether/develop' 2012-11-23 22:57:05 +01:00
Iván Eixarch
cc60b82a6e Import html by default and allow basic import/export features without abiword 2012-11-23 22:55:25 +01:00
Iván Eixarch
ef3231efd2 cleaning 2012-11-23 19:06:18 +01:00
Iván Eixarch
d0a17d5471 test import converting to html instead to txt by default 2012-11-23 18:18:03 +01:00
Simon Leblanc
94e9cf0a32 improving the translation of the timeline 2012-11-23 06:20:09 +01:00
Wikinaut
eed6b752d4 initial https version fix #1148 2012-11-22 10:12:58 +01:00
John McLear
1899e3f48d Merge pull request #1197 from hcartiaux/urlfix 
Fix urls, use github.com/ether
 2012-11-21 16:22:21 -08:00
Hyacinthe Cartiaux
d6027726e6
Fix urls, use github.com/ether 
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
 2012-11-22 01:12:30 +01:00
John McLear
a662db222f Merge pull request #1193 from kingmook/patch-1 
pad.js - Gramatical fix
 2012-11-21 14:42:12 -08:00
Mike Brousseau
196aafd9d6 Update src/static/js/pad.js 
Gramatically change. Changed "You're Password" to "Your Password".
 2012-11-21 13:35:47 -05:00
johnyma22
064051a30d Bump stuff to 1.2.1 2012-11-21 18:20:54 +00:00
John McLear
34df9d651e Merge pull request #1188 from joker-x/master 
Allow ! in pads urls
 2012-11-21 09:53:58 -08:00
Marcel Klehr
dcb3da829d Fix #1186 Autodetection wouldn't work correctly in IE9 2012-11-21 17:45:01 +01:00
Iván Eixarch
beb5bf4d7d Merge remote branch 'ether/develop' 2012-11-21 03:37:42 +01:00
Iván Eixarch
0c70ada9d7 Allow ! in urls autodetection 2012-11-21 03:35:49 +01:00
Marcel Klehr
a6cbcc9d51 Merge pull request #1185 from Nikerabbit/develop 
Localisation updates from http://translatewiki.net.
 2012-11-20 13:11:30 -08:00
Marcel Klehr
8a23c2ff50 Use ; as comments indicator in i18n files 2012-11-20 22:08:42 +01:00
Niklas Laxström
4e18df45c6 Localisation updates from http://translatewiki.net. 2012-11-20 20:47:34 +00:00
Marcel Klehr
4053ab2dfa Clarify English strings and rephrase some stupid-sounding messages. 2012-11-20 21:35:06 +01:00
Iván Eixarch
1e71797ad5 Replace Globalize with languages module 2012-11-20 19:46:17 +01:00
Sarhan Aissi
67de23225a Fix typo in pad.toolbar.clearAuthorship.title string in fr.ini 2012-11-18 16:44:59 +01:00
John McLear
d6c0f96084 Merge pull request #1177 from marcelklehr/fix/optimize-l10n-loading-times 
optimize l10n loading times
 2012-11-17 07:31:21 -08:00
John McLear
73eafb92c2 Merge pull request #1178 from marcelklehr/fix/tests 
Fix/tests
 2012-11-17 07:31:03 -08:00
Marcel Klehr
364e6928b5 Make tests work on windows 2012-11-17 16:28:54 +01:00
Marcel Klehr
5baef07b55 Load l10n.js first but asynchronusly 2012-11-17 15:28:33 +01:00
Marcel Klehr
e131f60071 Serve English strings directly with /locales.ini 2012-11-17 14:33:01 +01:00
Marcel Klehr
a39faf9368 Fix #1115 correctly reference session cookie 2012-11-17 14:19:09 +01:00
Sarhan Aissi
716aa13a79 Fix examples url in settings.html to use ether/ 2012-11-16 10:39:38 +01:00
Iván Eixarch
dd845f7731 fixed label languague 2012-11-15 13:41:44 +01:00
Iván Eixarch
ce371235b3 Traducción al castellano/Spanish translation 2012-11-15 11:44:31 +01:00
Marcel Klehr
6d2391dba6 Fix version number in changelog and package.json 2012-11-14 22:02:40 +01:00
John McLear
ae2fee8be8 Sigh. I must have forgotten to commit this.. 
Apologies.
 2012-11-14 19:38:17 +00:00
johnyma22
8b50f194a3 fix README to use ether/ 2012-11-14 19:26:37 +00:00
John McLear
68b1d78f32 Merge pull request #1159 from marcelklehr/fix/lang-autodetection 
Fix language auto-detection
 2012-11-14 10:58:07 -08:00
John McLear
a3ff346547 Merge pull request #1152 from marcelklehr/fix/updatePadClients-error 
PadMessageHandler: Make sure sessioninfos[session] still exists before p...
 2012-11-14 10:44:30 -08:00
Marcel Klehr
b416402f10 Fix language auto-detection 2012-11-14 19:38:35 +01:00
0ip
dcff0d74ef Fix Timeslider translation not showing up 2012-11-14 19:31:09 +01:00
Marcel Klehr
37450340ee Fix typo in timeslider.pageTitle string in french translation 2012-11-14 18:05:51 +01:00
0ip
b69396d5a0 Fix French locale une autre fois 2012-11-14 17:29:06 +01:00
0ip
d65460a409 Add missing colon in fr-locale 2012-11-14 17:15:28 +01:00
0ip
440804ce0b Update French localization 2012-11-14 17:13:19 +01:00
Marcel Klehr
f5563ab704 Move locale detection to the client 
* l10n.js is doing locale detection already, so
we shouldn't interfere but help it do its job
* this should also fix the ?lang embed parameter
* Set language from cookie on page init for l10n
to load the right translation
 2012-11-14 17:01:59 +01:00
Marcel Klehr
ffb7cf47f2 Mate timslider page title translateable 2012-11-14 15:31:43 +01:00
0ip
6b6315ca3c Tidy up settings 2012-11-14 14:26:49 +01:00
John McLear
2d31d3fc46 add colon to language 2012-11-14 12:20:41 +00:00
John McLear
2657f06887 Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n 2012-11-14 10:19:52 +00:00
John McLear
838a1e3d69 just export on timeslider, no import.. 2012-11-14 09:31:27 +00:00
John McLear
0e6a701f92 Update src/templates/timeslider.html 2012-11-14 09:20:16 +00:00
John McLear
e0935d9e25 Update src/locales/fr.ini 2012-11-13 20:09:02 +00:00
John McLear
c65a03aaff Update src/locales/fr.ini 2012-11-13 20:08:38 +00:00
johnyma22
a041cea834 French translation thanks to Francis-William Rhaume 2012-11-13 20:06:44 +00:00
John McLear
5b23e99d8c resolve #1044 
https://github.com/Pita/etherpad-lite/issues/1044
 2012-11-13 19:23:55 +00:00
Peter 'Pita' Martischka
6de7634357 merged develop back in 2012-11-13 07:43:48 -08:00
Peter 'Pita' Martischka
4c095202bd Merged branch feature/frontend-tests 2012-11-13 07:29:57 -08:00
0ip
b28afe4c47 Adjust border-color of #sidediv 2012-11-13 12:42:52 +01:00
0ip
c2253e49b6 Add ability to set language via URL parameter 2012-11-12 18:31:02 +01:00
0ip
b38f5d8f0c Fix German translation 2012-11-12 18:11:06 +01:00
Marcel Klehr
19c12239f6 Simplify lang setting in pad.html template 2012-11-12 18:04:21 +01:00
Marcel Klehr
993d501943 Make L10n.js requireable 2012-11-12 17:42:07 +01:00
Marcel Klehr
ed3020c729 Translate timeslider export links 2012-11-12 17:34:29 +01:00
Marcel Klehr
e81563e18d German translation for timeslider 2012-11-12 17:26:20 +01:00
Marcel Klehr
3bc59f0a7c Add english translation file 2012-11-12 17:25:53 +01:00
Marcel Klehr
378a74fb4e Remove translated strings from template files 2012-11-12 17:24:14 +01:00
Marcel Klehr
4154d464a5 Fix german translation 2012-11-12 16:53:39 +01:00
Marcel Klehr
7021a8b885 Add pad setting for UI lang 2012-11-12 16:49:15 +01:00
Marcel Klehr
fb340793da Add an empty locales/en.ini - English is default lang in templates 2012-11-11 11:56:59 +01:00
Marcel Klehr
e914c972f4 Add german translation for index.html and pad.html 2012-11-10 14:13:51 +01:00
Marcel Klehr
e5d1c6b279 Allow translation of pad.html 2012-11-10 14:13:10 +01:00
Marcel Klehr
145e893273 Allow translations for index.html 2012-11-10 14:12:58 +01:00
Marcel Klehr
a3504f70c4 Add i18n component 2012-11-10 14:12:17 +01:00
Marcel Klehr
e24ed46a08 PadMessageHandler: Make sure sessioninfos[session] still exists before pushing data to user. 2012-11-10 10:47:12 +01:00
Mike Brousseau
34594eb88b Update src/static/js/pad.js 
Check if the browser is IE and if so output the entire path via document.location over document.location.pathname to the cookie creation in createCookie()
 2012-11-08 13:47:21 -05:00