4340 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
John McLear	ef8dda0553	require is not defined... why not	2015-05-12 20:55:10 +01:00
Egil Moeller	e5abd185b5	Lots of fixes	2015-05-12 21:32:33 +02:00
Egil Moeller	0ec2592c53	Bugfixed a broken merge	2015-04-24 21:04:52 +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	431c55811f	Merge pull request #2606 from 0x46616c6b/traversal-fix-2 ... dont allow directory traversal #2	2015-04-12 18:27:18 +01:00
Egil Moeller	2472cd365e	ace.js AMDification	2015-04-12 18:10:17 +02: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
Egil Moeller	dade9520a4	Hooks can now be loaded as AMD	2015-04-12 11:32:59 +02:00
John McLear	e3f95d0c9c	Merge pull request #2604 from ether/pad-options ... session key is now ignored and also padOptions are available in settings	2015-04-11 22:33:46 +01:00
Egil Moeller	7a1f065702	More AMDificatioN	2015-04-11 23:08:09 +02:00
Peter 'Pita' Martischka	fc0cac0cad	merge object settings into default settings	2015-04-11 22:01:46 +01:00
John McLear	8ed12c7776	session key is now ignored and also padOptions are available in settings	2015-04-11 21:22:00 +01:00
John McLear	4a70837de9	Merge pull request #2602 from devoidfury/fix/import-large-etherpad ... fix large etherpad import, fixes #2524	2015-04-11 20:09:01 +01:00
Stefan	43687f6e8b	Merge pull request #2601 from Gared/session_key_file ... Move sessionKey setting from settings.json to SESSIONKEY.txt	2015-04-11 19:10:18 +02:00
Tom Hunkapiller	a896d67e8c	make setPadRaw async; streamline .etherpad file import handling chain	2015-04-11 12:02:19 -05:00
Stefan	a3ed82ad06	Move sessionKey setting from settings.json to SESSIONKEY.txt	2015-04-11 18:45:14 +02:00
John McLear	4234681efd	merge latest develop	2015-04-11 16:16:03 +01:00
John McLear	e488d95aca	include requirejs in package file	2015-04-11 16:15:08 +01:00
John McLear	25092fcb90	Merge pull request #2600 from devoidfury/fix/junk-binary-files ... fix: only match /javascript/* for caching middleware	2015-04-11 16:00:02 +01:00
Egil Moeller	9729af63e8	Cleanup	2015-04-11 16:57:58 +02:00
Tom Hunkapiller	133188320a	fix: only match /javascript/* for caching middleware	2015-04-11 09:54:40 -05:00
Egil Moeller	b86aa5d858	Hook modules can be in either CommonJS or AMD format, have to be AMD for client side	2015-04-11 16:51:01 +02:00
John McLear	1d44490dc4	Merge pull request #2599 from Gared/doc_api_fix ... Fix documentation for deleteSession api method	2015-04-11 15:07:18 +01:00
Stefan	a842eb4f5c	Fix documentation for deleteSession api method	2015-04-11 16:05:41 +02:00