2b46bc40a1
Beautify infinite scroll
2013-09-12 16:37:37 +02:00
8073c62de3
Merge pull request #1882 from fviard/develop
...
Fix to check if searchTerm is not "undefined" before trying to use it to...
2013-09-12 05:50:39 -07:00
c2e60a3919
Merge pull request #1850 from Wikinaut/develop
...
adding backlinks to main page on admin pages
2013-09-12 05:46:14 -07:00
6f478c4de1
Fix to check if searchTerm is not "undefined" before trying to use it to filter search results.
...
Signed-off-by: Florent Viard <fviard@lacie.com>
2013-09-11 11:36:09 +02:00
c4fcedbb8d
Merge pull request #1879 from Gared/binary-upload-fix
...
Add check if uploaded file only contains ascii chars when abiword disabled
2013-09-10 13:48:26 -07:00
b336e38637
Add check if uploaded file only contains ascii chars when abiword disabled
2013-09-10 21:58:28 +02:00
43e1af93c1
allow users to have colons in password
2013-09-10 16:00:36 +02:00
c08a4dd01f
Localisation updates from http://translatewiki.net .
2013-09-09 18:49:10 +00:00
527b7ad7f8
Merge pull request #1874 from tonoman3g/fix-padUsers-http-api-call
...
fix padUsers http api call in PadMessageHandler.js.
2013-09-09 08:00:11 -07:00
e60591a4d5
fix padUsers http api call in PadMessageHandler.js.
...
Add callback() function call to iterator function.
2013-09-09 21:24:41 +07:00
7ecf5f8c52
Localisation updates from http://translatewiki.net .
2013-09-02 18:50:54 +00:00
4305bb16ed
utf-8 without BOM; removed trailing white spaces
2013-08-14 21:46:57 +02:00
c3bffc2623
adding backlinks to main page in Admin pages; fix for https://github.com/ether/etherpad-lite/issues/1277
2013-08-14 21:42:59 +02:00
cb3ab51ee1
Localisation updates from http://translatewiki.net .
2013-07-30 17:46:04 +00:00
40f578cfbd
Merge pull request #1816 from bit/sessioninfos
...
export sessioninfos
2013-07-23 05:14:45 -07:00
c39eb4f443
Make use of the new plural macro
2013-07-23 12:43:30 +02:00
dabba91152
Update html10n.js
2013-07-23 12:42:55 +02:00
100c4627ec
Localisation updates from http://translatewiki.net .
2013-07-22 15:44:42 +00:00
5e3abb7054
Update en.sjon translation
...
pad.importExport.abiword.innerHTML
2013-07-22 15:52:48 +02:00
53fb4fc3fe
Merge pull request #1833 from digitalbazaar/fix-chrome-longlines-slowdown
...
Make pads with long lines usable with chrome.
2013-07-14 14:59:21 -07:00
3a9ef306a6
Localisation updates from http://translatewiki.net .
2013-07-14 21:25:00 +00:00
3a47e719d4
Make pads with long lines usable with chrome.
...
- Do not use incorpIfQuick on keyup because it's not ever quick
on chrome. Calling incorpIfQuick calls incorporateUserChanges
which sets a flag on the current callstack state indicating
that the selection has changed (since something was typed).
Whenever this flag is set, the event handler will run code
to update the selection (and possibly scroll the view as
well), which is a very costly operation in webkit browsers.
Instead let the user changes be incorporated by the idle worker,
scheduling it to run ASAP on keyup. This isn't a perfect
solution, but may make pads running on webkit browsers more
usable with otherwise fairly unnoticeable changes in the UI.
2013-07-14 01:51:39 -04:00
98a9a24d02
repo url as latest npm shows warn if non existant
2013-06-26 20:19:38 +01:00
53529cd031
Merge pull request #1815 from bit/patches
...
Some Patches
2013-06-25 06:54:51 -07:00
ba1a5da76d
bump and changelog
2013-06-24 13:35:17 +01:00
ee8af3454c
Merge pull request #1753 from ether/dont-crash-noauth
...
dont crash on no auth, just a bandaid
2013-06-18 07:52:34 -07:00
a62593e9a0
export sessioninfos so plugins can access it
...
allows plugins to map client.id to author id
2013-06-17 16:54:02 +02:00
9dd6471921
Add userLeave hook
2013-06-17 15:53:01 +02:00
bc5dc74f90
pass pad in postAceInit hook
...
no way for plugins to access current pad otherwise.
2013-06-17 15:52:51 +02:00
a554552bed
Simpify CSS for sticky chat
2013-06-17 14:47:28 +02:00
315e229c83
Localisation updates from http://translatewiki.net .
2013-06-17 11:28:14 +00:00
3d65f3d052
Merge pull request #1807 from dummys/develop
...
added log4js 0.6.6
2013-06-15 00:17:50 -07:00
ae78c6731d
Merge pull request #1811 from clkao/author-style-hook
...
Document author style hook and provide outer_ace dynamic css manager
2013-06-15 00:17:09 -07:00
f31db205da
allow cssmanager to manage outer_ace
2013-06-15 01:38:46 +08:00
8278ef3c7c
added log4js 0.6.6
2013-06-13 15:10:32 +02:00
82de797642
Only kept URL schemes which have an RFC standard
2013-06-12 12:31:38 -05:00
b4f155c028
Cleanup gophers
2013-06-12 11:20:36 -05:00
4c264aec4d
Localisation updates from http://translatewiki.net .
2013-06-10 08:45:19 +00:00
548f31a46a
new hook: aceSetAuthorStyle
2013-06-06 13:03:40 +08:00
eae9faa28c
refactor setAuthorStyle
2013-06-06 12:30:48 +08:00
7d81a6d042
Localisation updates from http://translatewiki.net .
2013-05-26 09:36:03 +00:00
9c69753a35
Localisation updates from http://translatewiki.net .
2013-05-20 09:30:23 +00:00
8ee15d4003
Localisation updates from http://translatewiki.net .
2013-05-12 18:40:40 +00:00
923c01745b
Localisation updates from http://translatewiki.net .
2013-05-09 13:39:04 +00:00
90d1598688
Merge pull request #1751 from goldquest/dev_IE8-fix
...
Fixing IE8 errors
2013-05-08 07:19:15 -07:00
2273cf9ed6
Merge pull request #1740 from ether/feature/add-cs-queue
...
add a changeset queue
2013-04-28 13:58:08 -07:00
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
702a300164
Localisation updates from http://translatewiki.net .
2013-04-28 17:48:19 +00:00
2c855de6f6
Add a server-side changeset queue per pad
...
fixes #1573
2013-04-27 23:04:42 +02:00
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
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
6ea5efbcc3
Update SocketIORouter.js
...
Changed the setting of client.remoteAddress
2013-04-22 23:01:41 +03:00
f0f98b41fe
Localisation updates from http://translatewiki.net .
2013-04-21 12:29:25 +00:00
bf4c86ed94
better message for admins
2013-04-17 23:48:11 +01:00
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
3b8621c6a0
dont crash on no auth, ust a bandaid
2013-04-17 19:50:05 +01:00
98c43aff43
fixed spacing
2013-04-17 18:17:14 +02:00
f478f99995
Merge pull request #1750 from ether/fix/authorship-once-and-4-all
...
Fix authorship sanitization
2013-04-17 08:13:22 -07:00
896f72311f
use document, not doc
2013-04-17 16:51:54 +02:00
566034ddf0
IE8 don't knows the Array.forEach function (simple version fix)
2013-04-17 16:51:43 +02:00
b08a6e522f
IE8 complains, if catch block is missing
2013-04-17 16:51:21 +02:00
146c75e703
Remove console.log in content collector
...
fixes #1731
2013-04-17 16:37:45 +03:00
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
cd288c70cb
Don't block changeset queue with delivering changeset
2013-04-17 14:26:11 +02:00
1c8b7a3661
Add a server-side changeset queue per pad
...
fixes #1573
2013-04-17 14:25:23 +02:00
e7a80b7b77
still express is stuck at 3.1.0
2013-04-16 00:12:11 +01:00
602380abb7
passing the ToolbarItem to the callback
2013-04-15 16:06:32 -07:00
f987299a5d
catch error on export
2013-04-15 23:01:08 +01:00
0c52fb5e30
Normalizing how select and button commands are triggered.
2013-04-15 11:32:59 -07:00
76e50e2c4d
Refactor SocketIORouter
2013-04-15 20:29:06 +02:00
9b952da692
Merge branch 'develop' of github.com:ether/etherpad-lite into update-connect
2013-04-15 19:07:01 +01:00
9a863824c9
update connect and express
2013-04-15 19:06:22 +01:00
4989f56673
undo avoid changeset spam as it breaks functionality
2013-04-15 14:36:25 +01:00
2c8699506d
push express back as it breaks sessions
2013-04-15 12:21:10 +01:00
c3c7a3d128
Merge pull request #1721 from ether/dont-send-same-cs-spam
...
temp patch for #1652
2013-04-15 04:20:05 -07:00
8a2977381f
Localisation updates from http://translatewiki.net .
2013-04-14 11:54:26 +00:00
90837437c5
Moving the toolbar plugin calls.
2013-04-13 12:06:51 -07:00
08b54ef61b
Merge pull request #1732 from ether/authorID-2
...
Correct authorID in Changeset on modification
2013-04-12 06:36:39 -07:00
337179fddd
remove console logs and cruft
2013-04-12 14:34:07 +01:00
f4de7f6a90
Use a string instead of an array!
2013-04-11 21:23:38 +02:00
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
e8d953a15c
Use the correct version number
2013-04-11 19:08:07 +03:00
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
a81a40d75b
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2013-04-11 17:05:24 +01:00
f4123d2904
bump v and readme
2013-04-11 17:04:54 +01:00
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
594757cc47
html10n.js: Don't break in getDirection if language hasn't been set
...
fixes #1724
2013-04-11 18:51:49 +03:00
9581097dc7
remove cruft
2013-04-11 16:39:25 +01:00
1fc906017c
final css
2013-04-11 16:38:41 +01:00
e712f7665d
working solution props to dmitryu for making me not be scared of modifying div clases
2013-04-11 16:33:03 +01:00
c755633f09
Update html10n.js to correctly use the console.log shim
...
fixes #1724
2013-04-10 17:56:09 +02:00
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
9dfac79107
no need to declare var twice
2013-04-09 15:58:18 +01:00
8836981e32
expose broadcast slider so plugins can interact with it
2013-04-09 15:55:14 +01:00
90c5b26e89
keep integrity on paste and better styling but new lists dont reset counter
2013-04-09 14:29:55 +01:00
2e76bd4e50
working but then create a second list, it will be stupid, SIGH
2013-04-09 01:22:09 +01:00
7885c410b5
Merge branch 'develop' of github.com:ether/etherpad-lite into keep-list-order-on-paste
2013-04-09 00:52:04 +01:00
bfa233ba04
kudos to quenenni for some working CSS
2013-04-09 00:46:13 +01:00
70a25964b6
make sure elements are supported, still doesn't assign numbers properly
2013-04-08 23:32:04 +01:00
49cff88a48
semi working
2013-04-08 23:03:19 +01:00
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
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
bf93500214
some polish for a turd
2013-04-08 19:50:52 +01:00
946289c221
temp patch for 1652
2013-04-08 19:46:45 +01:00
7728d5b321
remove draggable which was used for dragging users in the userbox
2013-04-08 17:23:03 +01:00
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
324b9b1f5f
pluginfw/installer: Only restart the server when all tasks have finished
...
fixes #1685
2013-04-08 16:14:03 +02:00
f135f79d13
only try to redraw the line height of lines that exist..
2013-04-07 19:06:15 +01:00
ffc8f61a2f
remove cruft
2013-04-07 18:44:13 +01:00
6c47e29e07
restore PMH original
2013-04-07 18:43:49 +01:00
12a2da2884
attempting to get right client authorid sent with changeset
2013-04-07 18:40:55 +01:00
555be31eab
Localisation updates from http://translatewiki.net .
2013-04-07 17:11:22 +00:00
85c68b1f51
rewrite author to actual author on changes
2013-04-07 16:28:28 +01:00
5b1de1421c
Localisation updates from http://translatewiki.net .
2013-04-07 10:36:57 +00:00
7492fb18a4
version bump
2013-04-06 14:29:21 +01:00
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
402a4b7b3e
html10n.js: Finally fix two-part locale specs
...
fixes #1706
2013-04-05 14:18:46 +02:00
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
6dc4ddd29e
no need for the language string on that div
2013-04-05 03:38:47 +01:00
883be3d48d
begin by adding some template css
2013-04-05 02:21:56 +01:00
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
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
380821781f
dont use top, use the scheduler
2013-04-04 02:25:19 +01:00
c5b4e4934d
Kick the user if has already successfully authenticated but his session became invalid later
2013-04-03 11:19:26 +02:00
5855e3d5bf
weird styling
2013-04-02 23:17:25 +01:00
57a9ccbb88
whoops, comments hurt
2013-04-02 23:16:28 +01:00
9e523191ea
whoops padid should be in payload..
2013-04-02 23:15:16 +01:00
8b1a11d5d8
Merge pull request #1697 from ether/longer-timeout
...
Longer timeout
2013-04-02 12:00:07 -07:00
56275d8de7
longer timeout on reconnection
2013-04-02 12:20:38 -07:00
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
04a53c4402
Merge branch 'feature/support-node-0.10' into develop
...
Conflicts:
src/package.json
2013-04-01 13:29:07 +02:00
98f00e293c
Update ueberDB to add support for node 0.10.x
2013-04-01 13:27:06 +02:00
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
1793e93ea1
Decode the sessionID before sending it to the server since our separator ',' gets encoded
2013-03-31 11:30:01 +02:00
911bfb30e4
Log when a sessionID in checkAccess is not found
2013-03-31 10:56:14 +02:00
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
7e3b288afc
log things the log4js-way; put all the brackets on a new line
2013-03-30 20:46:56 +01:00
253a8e37fd
Added debug-output to SecurityManager.checkAccess to indicate *why* an auth-try failed.
2013-03-30 20:34:45 +01:00
6a5e5cb6fd
Merge pull request #1640 from ether/caret-refactor
...
Caret refactor - I need help with tests...
2013-03-30 09:21:35 -07:00
358b07390e
fix "util.pump() is deprecated. Use readableStream.pipe()"
...
fix error introduced by b3988e3
2013-03-30 15:42:10 +01:00
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
c67c7ca746
remove messy bits
2013-03-29 03:09:10 +00:00
406ff8e6f8
Merge pull request #1681 from ether/loading_block
...
Loading blocks
2013-03-28 20:01:46 -07:00
d73ea4e334
Loading blocks
2013-03-29 02:24:15 +00:00
0ff5137da3
Make revision button glow on ctrl-s and increase duration
2013-03-28 16:39:33 +01:00
59a9ff404d
more settimeout to top window
2013-03-28 13:18:55 +00:00
c489177206
show light yellow for .5 secs on save revision keypress
2013-03-28 02:24:59 +00:00
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
09b32ea694
Merge pull request #1672 from ether/feature/admin-plugins-revamp
...
/admin/plugins revamp
2013-03-27 12:05:00 -07:00
2abb993e8b
Merge pull request #1607 from ether/custom-obj-msg
...
Custom Object messages
2013-03-27 11:50:56 -07:00
40cbe55507
Update en.json
2013-03-27 14:11:20 +00:00
cbee50d42d
/admin/plugins: Display a tooltip when hovering the plugin details link
2013-03-27 12:28:54 +01:00
bc8d6d4c45
/admin/plugins: Add a loading indicator to some messages
2013-03-27 12:20:50 +01:00
c4d9a71156
/admin/plugins: Fix update check
2013-03-27 12:02:19 +01:00
ac0018cdfa
Don't leak event listeners for process:uncaughtException
2013-03-26 21:19:09 +01:00
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
d01a209cbf
/admin/plugins: Dry up displaying of info messages
2013-03-26 21:04:21 +01:00
76c879bb47
/admin/plugins: Fix for smaller screens
2013-03-26 20:41:24 +01:00
806926d0f6
/admin/plugins: If a user installs sth scroll up to the loading indicator
2013-03-26 19:54:23 +01:00
4edb3b7ab3
/admin/plugins: Fix infinite scroll for larger screens
2013-03-26 19:32:15 +01:00
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
f75a839cd0
Remove plugin prefix in pluin lists and make links to plugins more clear
2013-03-26 18:39:46 +01:00
7edfff7574
/admin/plugins: Show some text if nothing is display otherwise
2013-03-26 16:23:47 +01:00
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
981a33f01e
pluginfw/installer.js fire callbacks only once
2013-03-26 14:40:19 +01:00
aca5d150e4
/admin/plugins: Don't list installed plugins as available
2013-03-26 11:58:31 +01:00
511407241a
/admin/plugins: Make it display the same amount of plugins after sorting
2013-03-26 11:38:51 +01:00
5d7a8adcb7
Silence npm when using npm.commands.search
2013-03-26 11:33:04 +01:00
9109bd206e
Catch all errors in pluginfw/installer.js
2013-03-26 11:20:12 +01:00
e8bae61cf5
/admin/plugins: Add progress indicators and report errors
2013-03-26 11:19:36 +01:00
6b55d13370
expose ace document, reqjired for various plugins
2013-03-26 01:54:01 +00:00
b35d9c14fd
/admin/plugins:Hide ep_etherpad-lite in the list of installed plugins
2013-03-25 23:52:10 +01:00
773293991b
admin/plugins: Allow people to sort search results
2013-03-25 23:09:03 +01:00
1ebbcd2f30
Don't leak event listeners in pluginfw/installer.js
...
fixes #921
2013-03-25 17:22:51 +01:00
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
b297784288
Make npm registry access code more sane
2013-03-25 16:51:12 +01:00
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
ef7fb5c7f0
Update npm
2013-03-25 12:18:06 +01:00
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
c78aad16ea
adds missing semicolons in src/node/utils folder
2013-03-24 01:18:44 +01:00
d515acae96
expires was never defined
2013-03-23 18:01:44 +00:00
b3988e30d5
pump isdeprecated
2013-03-23 17:55:34 +00:00
35e4891217
Localisation updates from http://translatewiki.net .
2013-03-23 13:26:38 +00:00
0063933041
fix cookies
2013-03-23 02:59:12 +00:00
cbde18945c
Bumped the ueberDB package version to 0.1.96 to add in Cassandra support.
2013-03-22 15:22:17 +00:00
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
4ea7ccd104
merge develop
2013-03-20 01:11:27 +00:00
9d14c3708d
Merge pull request #1644 from ether/chatMsgHook
...
hook for chat msg
2013-03-19 18:10:31 -07:00
bcb92f25a6
Refactor chat notifications and the chatNewMessage hook
2013-03-19 20:21:27 +01:00
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
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
a628317b55
Log http on debug log level
...
... and additionally log the response time
2013-03-19 18:34:21 +01:00
a9bd081a44
more clean up
2013-03-19 16:55:42 +00:00
9bb0587447
working and jsonify obj
2013-03-19 16:40:51 +00:00
2916b39c24
make sure the sessionID target is right
2013-03-19 16:21:04 +00:00
cb45c44b4d
Merge pull request #1588 from disy-mk/patch-2
...
fix #1586
2013-03-19 08:47:26 -07:00
d0e656d0a6
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
2013-03-19 13:59:07 +00:00
7741f762e2
hook for chat msg
2013-03-19 02:21:53 +00:00
07adb45503
Merge pull request #1643 from ether/fix/html10n-update
...
Update html10n.js
2013-03-18 14:38:22 -07:00
e49620ea07
update ueber for pg
2013-03-18 21:36:50 +00:00
b3dbf1c995
Update html10n.js
2013-03-18 22:29:42 +01:00
2bc45de106
Fix #1639 by removing bodyParser middleware introduced with swagger REST API
2013-03-18 22:09:47 +01:00
3562672a75
stop start point going negative
2013-03-18 18:44:01 +00:00
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
9f54a65c88
refactored arrow keys now work after paste in chrome
2013-03-18 17:40:18 +00:00
83ed9303da
Localisation updates from http://translatewiki.net .
2013-03-18 00:43:57 +00:00
3e0a80cb74
remove console log
2013-03-17 15:17:36 +00:00
693b9b9b94
better mobile support for gritter messages, before it was awful
2013-03-17 01:23:31 +00:00
a1d9d27cde
much cleaner way of showing / hiding overlay
2013-03-16 17:57:23 +00:00
69a4ab76cf
hide modal once reconnect is good
2013-03-16 17:50:53 +00:00
13ad46aa67
a safer approach I think but still be careful
2013-03-16 13:19:12 +00:00
cd9c78998e
Fix path.join in Settings.js
2013-03-16 09:47:10 +01:00
54433db47f
release v1.2.9
2013-03-15 21:43:29 +01:00
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
de552df6db
Fix clearing authorship colors which was broken by #1609
...
Fixes #1620
2013-03-15 18:08:51 +01:00
cf041dcb08
Merge pull request #1618 from ether/tidy-up
...
Tidy up
2013-03-14 14:32:13 -07:00
5d12be940c
return text instead of html
2013-03-14 18:28:35 -03:00
383439629a
specialkey doesnt even exist afaik
2013-03-14 18:27:32 -03:00
1bb9d1d625
remove pointless +
2013-03-14 18:23:27 -03:00
d72abceee7
escape .color
2013-03-14 18:18:14 -03:00
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
ac9b972358
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
2013-03-14 12:01:09 -03:00
5fe60e7221
redirect /admin to /admin/ so that the relative links work
2013-03-14 15:59:39 +01:00
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
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
babb33d825
add authorId to chat and userlist, possibly privacy/security issue?
2013-03-13 21:55:29 +01:00
988653b8ce
Toolbar hooks
2013-03-12 19:36:04 -07:00
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
acb4b4ebaf
Localisation updates from http://translatewiki.net .
2013-03-11 04:52:12 +00:00
52aa7d3997
Registering commands on the ace toolbar
2013-03-10 15:42:12 -07:00
292a3bd7b7
Setting up the right toolbar.
2013-03-09 14:57:42 -08:00
26a6765b50
fix indent on chrome in linux
2013-03-08 08:40:40 -08:00
0b16d96c97
Merge pull request #1527 from nelsonsilva/swagger
...
Initial work on new swagger based REST API
2013-03-07 08:07:46 -08:00
3cafa24982
Fix variable name typo in PadMessageHandler.padUsers
2013-03-07 09:37:03 -05:00
0c9214bb27
bump v and changelog
2013-03-06 15:08:27 +00:00
1e94eaa06c
fix safari rtl dissapearing pad
2013-03-06 14:50:08 +00:00
5731ef7802
Fix ace rtlIsTrue property setter
2013-03-06 15:40:02 +01:00
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
a5987285e0
Multiple REST endpoints (one per version)
2013-03-06 10:10:21 +00:00
8f279a6710
Added some fixes to make it work with the codegen
2013-03-06 10:10:21 +00:00
1cfc8eda19
Initial work on swagger
2013-03-06 10:10:21 +00:00
760e1b82c3
Add a setting for RTL text direction (integrating the url paramter)
...
Fixes #1191
2013-03-05 23:12:00 +01:00
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
67a0730710
added nodemailer to package.json - fix #1586
2013-03-05 21:28:38 +01:00
3dee4098b0
update ueberdb
2013-03-05 13:24:24 +00:00
6c304f0480
Localisation updates from http://translatewiki.net .
2013-03-04 11:46:05 +00:00
c57bc444cd
basic toolbar setup
2013-03-03 16:06:14 -08:00
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
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
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
Marcel Klehr
Florent Viard
John McLear
Gared
vileda
Siebrand Mazeland
tonoman3g
Wikinaut
Dave Longley
j
Chia-liang Kao
dummys
Kyle Kelley
Brian Emerick
Spruce (Felix Fichte)
spruce
goldquest
cohitre
mluto
Bernard `Guyzmo` Pratz
Manuel Knitza
disy-mk
Simon Gaeremynck
Sahil Amoli
Jordan Hollinger
nelson.silva
