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-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity
4357 commits 207 branches 105 tags 124 MiB
Commit graph

4357 commits

This branch
This branch
All branches
Author SHA1 Message Date
Egil Moeller
6cf6d57b08 Merge branch 'develop' of github.com:ether/etherpad-lite into requirejs 
Conflicts:
	src/static/js/ace2_inner.js
 2015-04-25 20:02:55 +02:00
Egil Moeller
61e0442ec7 Bugfixes 2015-04-25 19:56:22 +02:00
Egil Moeller
90b359c82b Merge remote-tracking branch 'remotes/origin/iframes-must-die' into requirejs 
Conflicts:
	src/static/js/ace.js
	src/static/js/chat.js
	src/static/js/collab_client.js
	src/static/js/pad.js
	src/static/js/pad_editbar.js
 2015-04-25 18:15:48 +02:00
Egil Moeller
0ec2592c53 Bugfixed a broken merge 2015-04-24 21:04:52 +02:00
John McLear
254edffa9c fixes #2547 2015-04-24 14:17:49 +01:00
John McLear
a6a8c4d909 provide a script that cleans up before running to save people doing rm rf src node_modules 2015-04-24 07:07:18 +01:00
John McLear
b349a4f226 probably fixes #2625 2015-04-23 17:49:08 +01:00
John McLear
b4163fc862 fix docs 2015-04-23 17:27:54 +01:00
John McLear
d7c7c96145 Merge pull request #2636 from andreassolberg/develop 
Adding support for providing intermediate CA certificates
 2015-04-22 20:38:42 +01:00
Andreas Åkre Solberg
ec7b3fc787 Adding support for providing intermediate CA certificates when running etherpad-lite with ssl through Node/expressjs 2015-04-22 20:29:19 +02:00
John McLear
2cd280a44b merge develop back in 2015-04-19 11:46:41 +01:00
John McLear
d31523aa08 Update hooks_server-side.md 2015-04-17 15:58:23 +01:00
Stefan
29ab7b9026 Merge pull request #2619 from ether/master 
Master
 2015-04-16 23:54:21 +02:00
Stefan
e509824f29 Merge new release into master branch! 2015-04-16 23:06:58 +02:00
Stefan
2393ea01f0 Release version 1.5.6 2015-04-16 23:06:24 +02:00
John McLear
70d338c7d5 Merge pull request #2618 from Gared/win_node_version 
Update node version for windows build to 0.12.2
 2015-04-16 21:58:13 +01:00
Stefan
f81c6b6476 Update node version for windows build to 0.12.2 2015-04-16 22:56:14 +02:00
John McLear
ee10a21d82 Merge pull request #2617 from devoidfury/fix/windows-issue-2614 
revert to old path handling, but strip out "..". fixes #2614
 2015-04-15 20:38:02 +01:00
Tom Hunkapiller
6ff7d4e9a6 revert to old path handling, but strip out "..". fixes #2614 2015-04-15 14:31:21 -05:00
John McLear
1fbf0db650 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-04-15 15:51:27 +01:00
John McLear
a3ce6b1ca7 remove two pointless dep removes 2015-04-15 15:51:13 +01:00
John McLear
33594a7246 Update README.md 2015-04-15 11:52:03 +01:00
Stefan
89bd155ca2 Merge pull request #2611 from ether/master 
Master
 2015-04-13 18:21:21 +02:00
Stefan
24b0712d77 Merge new release into master branch! 2015-04-13 17:27:37 +02:00
Stefan
64d94cb346 Release version 1.5.5 2015-04-13 17:27:14 +02:00
John McLear
629f909d57 add some semicoolons to prevent chrome warning 2015-04-13 10:52:15 +01:00
Egil Moeller
0c94c8ade5 Bugfix 2015-04-12 22:29:31 +02:00
Egil Moeller
250b8928bd The Big Rewrite to AMD format - had to do lots of them at once 2015-04-12 21:03:59 +02:00
John McLear
27d4686ff8 readwrite should be on innerdoc 2015-04-12 19:30:06 +01:00
John McLear
20e899476a make chat go in right place 2015-04-12 19:27:34 +01:00
Peter 'Pita' Martischka
5dc4b315fe Merge branch 'iframes-must-die' of github.com:ether/etherpad-lite into iframes-must-die 2015-04-12 19:24:21 +01:00
Peter 'Pita' Martischka
bf352ffcca fixed merge conflicts 2015-04-12 19:24:02 +01:00
John McLear
5f71c899ab proper targeting of css rules 2015-04-12 19:23:06 +01:00
Peter 'Pita' Martischka
b2c312e72e replaced some parent 2015-04-12 19:22:00 +01:00
John McLear
06aa9e4db6 fix editbar position, stop popups from closing on open 2015-04-12 19:02:49 +01:00
John McLear
431c55811f Merge pull request #2606 from 0x46616c6b/traversal-fix-2 
dont allow directory traversal #2
 2015-04-12 18:27:18 +01:00
Peter 'Pita' Martischka
ea7f4079fb some more css fixes 2015-04-12 17:29:17 +01:00
Peter 'Pita' Martischka
4f888190ae line numbers have correct height 2015-04-12 17:19:01 +01:00
Egil Moeller
2472cd365e ace.js AMDification 2015-04-12 18:10:17 +02:00
Peter 'Pita' Martischka
99a6e2ab8f remove editor iframes, first step 2015-04-12 16:37:38 +01:00
louis
0fa7650df8 dont allow directory traversal #2 2015-04-12 17:12:35 +02:00
John McLear
0dfecb3af7 change target for IE 9 test 2015-04-12 14:05:49 +01:00
Egil Moeller
2f12fc0229 Removed some more minify stuff 2015-04-12 14:24:03 +02:00
John McLear
4ef6604ca9 dont test against IE8 any more as we dont care about it 2015-04-12 13:16:32 +01:00
John McLear
6a027d88a9 fix older IEs 2015-04-12 13:00:01 +01:00
Egil Moeller
6cbf8a6245 Embed less 2015-04-12 13:55:08 +02:00
Egil Moeller
027d9e3a70 Some amd loading of hooks 2015-04-12 13:33:33 +02:00
Egil Moeller
77449760f6 Indentation 2015-04-12 13:08:26 +02:00
John McLear
30ea6bd7ab allow different syntax 2015-04-12 11:40:57 +01:00
John McLear
5435063a2f re-fix rtl 2015-04-12 10:35:24 +01:00