75cd4b3333
Merge pull request #2924 from Gared/update_windows_build
...
Update windows build
2016-03-26 22:11:40 +08:00
8df8228a36
Merge pull request #2926 from storytouch/addAuthorOnRemoveAttributeOnLine
...
Update author when removing line attribute from line
2016-03-26 22:11:22 +08:00
b698927474
Merge pull request #2931 from Gared/improve_node_version_check
...
Improve node version check
2016-03-26 22:09:53 +08:00
9b1598d50c
Merge pull request #2937 from Gared/fix_backend_test_error
...
Fix check in backend tests
2016-03-26 22:08:56 +08:00
97b971747f
forgot this one
2016-03-26 22:01:26 +08:00
4846798528
extend attributesonselection method
2016-03-26 22:00:34 +08:00
7dd26bd250
Localisation updates from https://translatewiki.net .
2016-03-24 07:15:23 +01:00
d7c4cc8e65
Fix check in backend tests
2016-03-23 16:47:52 +01:00
04e8b0c184
Localisation updates from https://translatewiki.net .
2016-03-21 07:09:41 +01:00
fb7856fc8f
Merge pull request #2932 from Gared/fix_xss_iframe_link
...
Fix a possible xss attack in iframe link
2016-03-20 15:29:37 +00:00
02551d772c
Fix a possible xss attack in iframe link
2016-03-20 16:28:06 +01:00
2a81d2a578
Remove support for io.js
2016-03-20 15:21:56 +01:00
18d583d92d
Check for node version 4 or higher and not special versions
2016-03-20 15:19:34 +01:00
3738211fd8
Do not include absolute path in windows zip
2016-03-20 14:13:26 +01:00
175c29ff66
Localisation updates from https://translatewiki.net .
2016-03-17 08:47:38 +01:00
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
bd2372def1
Update windows build:
...
- Update node to version 4.4.0
- Create temp folder dynamically
2016-03-14 21:56:04 +01:00
a3188cf357
Localisation updates from https://translatewiki.net .
2016-03-14 08:09:25 +01:00
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
b6ab6f2b13
Localisation updates from https://translatewiki.net .
2016-03-09 13:38:20 +01:00
d88052726d
Localisation updates from https://translatewiki.net .
2016-02-19 15:05:09 +01:00
6df7ff2d08
Merge pull request #2893 from bhldev/cssFontColors
...
Css default colors Issue #2853
2016-02-14 14:54:13 +01:00
8b8811c7ad
Localisation updates from https://translatewiki.net .
2016-02-08 11:36:53 +01:00
32d90418ca
Merge pull request #2890 from bhldev/languageTimesliderUrlParameter
...
Timeslider Not Translated Issue 2885
2016-02-06 22:38:02 +01:00
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
319ebb29fd
Localisation updates from https://translatewiki.net .
2016-02-01 09:23:34 +01:00
dde4fdfdbd
Highlight and link more URI schemes: about, geo, tel
2016-01-30 19:03:42 +01:00
b46e5db777
Localisation updates from https://translatewiki.net .
2016-01-25 07:38:47 +01:00
fbe3710dda
Merge pull request #2863 from gutobenn/padname-size
...
Limit padname input field to 50 characters
2016-01-23 13:51:57 +01:00
aaa28640cf
CSS Default Font Colors for Issue 2853
2016-01-22 19:42:06 -05:00
49d38522b1
Timeslider Not Translated Issue 2885
2016-01-20 02:30:25 -05:00
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
d994baeefa
Merge pull request #2886 from bhldev/padOptionsLang
...
Set language cookie on initial load Issue #2882
2016-01-19 23:48:30 +00:00
13d9bdf03a
Merge pull request #2887 from bhldev/editorListIndentOutdent
...
Editor List Fix for 2844 and 2812
2016-01-19 23:48:20 +00:00
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
ae033a1e86
Fix for 2844 and 2812
2016-01-18 23:57:40 -05:00
0b521f6528
Localisation updates from https://translatewiki.net .
2016-01-18 08:01:50 +01:00
295672f598
Set language cookie on initial load
2016-01-17 21:44:03 -05:00
f9937343c7
fix drop event on last char
2016-01-17 15:11:54 +00:00
c70d655b96
Add appendText API (from #2810 ) to docs.
2016-01-13 07:26:20 -05:00
855bd270bd
Localisation updates from https://translatewiki.net .
2016-01-11 08:28:02 +01:00
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
935b921c2b
more tidy
2016-01-10 14:40:57 +00:00
50c6b5ed61
tidy up
2016-01-10 14:39:41 +00:00
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
f80407c6ff
removal
2016-01-08 13:41:52 +00:00
cb874b695b
herp
2016-01-08 13:40:25 +00:00
ae6110919f
removal
2016-01-08 13:39:59 +00:00
793b34d17b
hrm, removal
2016-01-08 13:39:32 +00:00
f16616d23b
seems to work
2016-01-08 13:26:46 +00:00
John McLear