Luiza Pagliari
9bcf8690c0
Update author when removing line attribute from line
...
This avoids raising error 'Trying to submit changes as another author in
changeset' when 2 authors change line attributes of the same line. This
fixes issue #2925 .
2016-03-15 15:44:00 -03:00
Niklas Laxström
a3188cf357
Localisation updates from https://translatewiki.net .
2016-03-14 08:09:25 +01:00
Stefan
c5c2b0a82b
Merge pull request #2889 from reedacartwright/reedacartwright-patch-1
...
Use exec to switch to node process
2016-03-13 23:44:56 +01:00
Siebrand Mazeland
b6ab6f2b13
Localisation updates from https://translatewiki.net .
2016-03-09 13:38:20 +01:00
Siebrand Mazeland
d88052726d
Localisation updates from https://translatewiki.net .
2016-02-19 15:05:09 +01:00
Stefan
6df7ff2d08
Merge pull request #2893 from bhldev/cssFontColors
...
Css default colors Issue #2853
2016-02-14 14:54:13 +01:00
Niklas Laxström
8b8811c7ad
Localisation updates from https://translatewiki.net .
2016-02-08 11:36:53 +01:00
Stefan
32d90418ca
Merge pull request #2890 from bhldev/languageTimesliderUrlParameter
...
Timeslider Not Translated Issue 2885
2016-02-06 22:38:02 +01:00
Stefan
5f5d8cada8
Merge pull request #2862 from Gared/set_mysql_connection_charset
...
set charset for mysql connection in settings.json
2016-02-02 21:12:07 +01:00
Niklas Laxström
319ebb29fd
Localisation updates from https://translatewiki.net .
2016-02-01 09:23:34 +01:00
Niklas Laxström
b46e5db777
Localisation updates from https://translatewiki.net .
2016-01-25 07:38:47 +01:00
Stefan
fbe3710dda
Merge pull request #2863 from gutobenn/padname-size
...
Limit padname input field to 50 characters
2016-01-23 13:51:57 +01:00
Brian Lim
aaa28640cf
CSS Default Font Colors for Issue 2853
2016-01-22 19:42:06 -05:00
Brian Lim
49d38522b1
Timeslider Not Translated Issue 2885
2016-01-20 02:30:25 -05:00
John McLear
9335ae00d0
Merge pull request #2881 from luser/append-text-docs
...
Add appendText API (from #2810 ) to docs.
2016-01-19 23:48:45 +00:00
John McLear
d994baeefa
Merge pull request #2886 from bhldev/padOptionsLang
...
Set language cookie on initial load Issue #2882
2016-01-19 23:48:30 +00:00
John McLear
13d9bdf03a
Merge pull request #2887 from bhldev/editorListIndentOutdent
...
Editor List Fix for 2844 and 2812
2016-01-19 23:48:20 +00:00
Reed A. Cartwright
843b05a6ec
Use exec to switch to node process
...
At the end of run, `exec` should be used to switch to the node process. That way node will take over the pid of `sh run.sh`, making it easier to monitor and daemonize the server.
```
exec [command [arg ...]]
Unless command is omitted, the shell process is replaced with the
specified program (which must be a real program, not a shell
built-in command or function). Any redirections on the exec com-
mand are marked as permanent, so that they are not undone when
the exec command finishes.
```
2016-01-19 16:17:16 -07:00
Brian Lim
ae033a1e86
Fix for 2844 and 2812
2016-01-18 23:57:40 -05:00
Niklas Laxström
0b521f6528
Localisation updates from https://translatewiki.net .
2016-01-18 08:01:50 +01:00
Brian Lim
295672f598
Set language cookie on initial load
2016-01-17 21:44:03 -05:00
John McLear
f9937343c7
fix drop event on last char
2016-01-17 15:11:54 +00:00
Ted Mielczarek
c70d655b96
Add appendText API (from #2810 ) to docs.
2016-01-13 07:26:20 -05:00
Niklas Laxström
855bd270bd
Localisation updates from https://translatewiki.net .
2016-01-11 08:28:02 +01:00
John McLear
eeab7e8958
Merge pull request #2876 from ether/drag-and-drop-between-frames-sandbox
...
Drag and drop between frames
2016-01-10 14:48:21 +00:00
John McLear
935b921c2b
more tidy
2016-01-10 14:40:57 +00:00
John McLear
50c6b5ed61
tidy up
2016-01-10 14:39:41 +00:00
John McLear
ef9cf974a2
Merge branch 'develop' of github.com:ether/etherpad-lite into drag-and-drop-between-frames-sandbox
2016-01-10 14:37:44 +00:00
John McLear
f80407c6ff
removal
2016-01-08 13:41:52 +00:00
John McLear
cb874b695b
herp
2016-01-08 13:40:25 +00:00
John McLear
ae6110919f
removal
2016-01-08 13:39:59 +00:00
John McLear
793b34d17b
hrm, removal
2016-01-08 13:39:32 +00:00
John McLear
f16616d23b
seems to work
2016-01-08 13:26:46 +00:00
John McLear
638757fdb5
Update DB.js
2016-01-06 00:01:48 +00:00
John McLear
dbc777dd13
Merge pull request #2871 from tiblu/pad_userlist_add_usersOnline_fix_bug_in_users
...
pad_userlist.js: BUGFIX: users() returning duplicates on several calls. FEATURE: usersOnline() returns only online users
2016-01-05 21:15:52 +00:00
Mikk Andresen
ccbcf0ddce
Add usersOnline function to pad_userlist, fix a bug where several occurances of current user were pushed to users list.
2016-01-05 18:22:32 +02:00
John McLear
239f517afd
Update package.json
2016-01-03 01:03:05 +00:00
Mikk Andresen
aab7186486
Fix handleClientMessage_USER_* payloads not containing user info
2015-12-31 14:19:23 +02:00
Niklas Laxström
2e81b39028
Localisation updates from https://translatewiki.net .
2015-12-29 10:44:17 +01:00
John McLear
34a46d6318
should be clean enough to push
2015-12-23 14:35:52 +00:00
Augusto Bennemann
a34c8e4721
Limit padname size to 50 characters
2015-12-22 13:25:56 -02:00
Stefan
8bf53c63cc
set charset for mysql connection in settings.json
2015-12-21 21:02:54 +01:00
John McLear
b519f9f156
include req and res in export convert hook
2015-12-21 17:32:05 +00:00
John McLear
577102b025
license
2015-12-21 16:29:09 +00:00
John McLear
41ced5e239
Merge pull request #2859 from cmbirk/develop
...
Check for SOffice before removing export links
2015-12-21 16:12:25 +00:00
John McLear
34d757ff7f
Merge pull request #2860 from tiblu/documentation_add_postToolbarInit_and_usage_examples
...
Add postToolbarInit documentation and usage examples
2015-12-21 09:50:24 +00:00
Mikk Andresen
4ad759dd25
Add postToolbarInit documentation and usage examples
2015-12-18 13:33:49 +02:00
Chris Birk
d6033de0da
Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook
2015-12-18 00:14:13 -06:00
Chris Birk
313f390e7a
remove logging
2015-12-17 21:56:33 -06:00
Chris Birk
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
