Commit Graph

4625 Commits (a7405825a8fa011bdea2a50fd6b0f2756abd674d)

Author SHA1 Message Date
Niklas Laxström a7405825a8 Localisation updates from https://translatewiki.net. 2016-05-26 07:57:20 +02:00
John McLear 73414df3c7 heh whoops :) 2016-05-20 14:43:01 +01:00
John McLear a8487dd5dc client Var value for disabling scripts 2016-05-20 14:42:05 +01:00
Niklas Laxström 94920e5552 Localisation updates from https://translatewiki.net. 2016-05-19 09:25:51 +02:00
Stefan cd459bfde3 Merge pull request #2987 from Gared/fix_space_in_path
Fix error if whitespace in etherpad path
2016-05-16 17:16:16 +02:00
Stefan 1349cfd486 Fix error if whitespace in etherpad path 2016-05-16 16:58:58 +02:00
Stefan f49de0b61b Merge pull request #2961 from xiemaisi/fix-2951
Fix useless comparison in sussonsAndGroups test.
2016-05-14 15:10:23 +02:00
Niklas Laxström b24e62f90a Localisation updates from https://translatewiki.net. 2016-05-12 08:59:06 +02:00
Max Schaefer b94fb2b54d Fix useless comparison in sussonsAndGroups test. 2016-05-05 11:50:39 +01:00
Niklas Laxström c5638dd7e5 Localisation updates from https://translatewiki.net. 2016-05-02 07:25:28 +02:00
Stefan e0e742eeb7 Merge pull request #2953 from ether/master
Add version 1.6.0 changelogs
2016-04-24 21:33:12 +02:00
Stefan 5ed9f2736a Add version 1.6.0 changelogs 2016-04-24 21:32:21 +02:00
Stefan a076589b58 Merge pull request #2952 from ether/master
Merge release 1.6.0
2016-04-24 21:21:04 +02:00
Stefan dcfb287990 Merge new release into master branch! 2016-04-24 21:04:16 +02:00
Stefan ebe44b0eab Release version 1.6.0 2016-04-24 21:03:42 +02:00
Stefan fb96f32028 Update node for windows to version 4.4.3 2016-04-24 20:42:53 +02:00
Stefan 8aa297fb40 Remove node version output on start 2016-04-24 20:29:07 +02:00
Niklas Laxström 15c9041f12 Localisation updates from https://translatewiki.net. 2016-04-18 07:04:42 +02:00
Niklas Laxström 6e78895cdd Localisation updates from https://translatewiki.net. 2016-04-11 07:07:32 +02:00
John McLear 6b6a028355 include the padId 2016-04-09 20:01:49 +01:00
Niklas Laxström 21372c93a3 Localisation updates from https://translatewiki.net. 2016-04-07 08:00:19 +02:00
John McLear 282b1cdcfe Merge pull request #2940 from ether/extend-getAttributesOnSelection
extend attributesonselection method
2016-04-05 22:30:15 +01:00
Stefan 7637b0cd19 Increase version of node for windows to 4.4.2 2016-04-03 16:57:15 +02:00
Stefan 474e5c42d1 Merge pull request #2942 from Gared/fix_frontend_tests
Fix document.domain error in frontend tests
2016-04-01 21:51:23 +02:00
Stefan 103e07e828 Fix document.domain error in frontend tests 2016-03-29 16:16:22 +02:00
Niklas Laxström 8f2f01dff8 Localisation updates from https://translatewiki.net. 2016-03-28 10:09:39 +02:00
John McLear e1999d826c allow greater than or equal to v 4 2016-03-27 13:31:00 +08:00
John McLear 6f2e155668 Merge pull request #2898 from rohieb/feature/more-uri-schemes
Highlight and link more URI schemes: about, geo, tel
2016-03-26 22:14:38 +08:00
John McLear 75cd4b3333 Merge pull request #2924 from Gared/update_windows_build
Update windows build
2016-03-26 22:11:40 +08:00
John McLear 8df8228a36 Merge pull request #2926 from storytouch/addAuthorOnRemoveAttributeOnLine
Update author when removing line attribute from line
2016-03-26 22:11:22 +08:00
John McLear b698927474 Merge pull request #2931 from Gared/improve_node_version_check
Improve node version check
2016-03-26 22:09:53 +08:00
John McLear 9b1598d50c Merge pull request #2937 from Gared/fix_backend_test_error
Fix check in backend tests
2016-03-26 22:08:56 +08:00
John McLear 97b971747f forgot this one 2016-03-26 22:01:26 +08:00
John McLear 4846798528 extend attributesonselection method 2016-03-26 22:00:34 +08:00
Niklas Laxström 7dd26bd250 Localisation updates from https://translatewiki.net. 2016-03-24 07:15:23 +01:00
Stefan d7c4cc8e65 Fix check in backend tests 2016-03-23 16:47:52 +01:00
Niklas Laxström 04e8b0c184 Localisation updates from https://translatewiki.net. 2016-03-21 07:09:41 +01:00
John McLear 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
Stefan 02551d772c Fix a possible xss attack in iframe link 2016-03-20 16:28:06 +01:00
Stefan 2a81d2a578 Remove support for io.js 2016-03-20 15:21:56 +01:00
Stefan 18d583d92d Check for node version 4 or higher and not special versions 2016-03-20 15:19:34 +01:00
Stefan 3738211fd8 Do not include absolute path in windows zip 2016-03-20 14:13:26 +01:00
Niklas Laxström 175c29ff66 Localisation updates from https://translatewiki.net. 2016-03-17 08:47:38 +01:00
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
Stefan bd2372def1 Update windows build:
- Update node to version 4.4.0
- Create temp folder dynamically
2016-03-14 21:56:04 +01: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