902 commits

Author	SHA1	Message	Date
John McLear	f3e5682a0f	fix issue with load of showuserandchat	2015-01-24 18:31:19 +00:00
John McLear	3f08bf7405	Merge pull request #2490 from Gared/https_plugins_json ... Use https to download plugins.json	2015-01-24 13:34:41 +00:00
Stefan	da86110f58	Use https to download plugins.json	2015-01-24 12:55:17 +01:00
Stefan	713b369fc3	Add 'last update' column to plugins table	2015-01-24 12:49:17 +01:00
John McLear	036dea3d0f	styling	2015-01-21 17:25:06 +00:00
John McLear	657974b518	move saved revs notification to gritter	2015-01-21 16:40:44 +00:00
John McLear	753e8fdf0b	working logic	2015-01-21 16:08:54 +00:00
John McLear	17fa87552d	styling	2015-01-21 15:48:21 +00:00
John McLear	941cc3c24b	url param	2015-01-21 15:37:55 +00:00
John McLear	920ec9c553	Merge pull request #2467 from ether/chat-and-users ... Show users and Chat at the same time	2015-01-21 15:22:23 +00:00
John McLear	3cd8759cec	expose modernIE value	2015-01-21 15:21:31 +00:00
John McLear	3fd6e72657	try again	2015-01-21 15:06:29 +00:00
John McLear	a2cb8a2f19	rename back to browser	2015-01-21 15:01:39 +00:00
John McLear	f2891e3b8b	working	2015-01-21 14:55:29 +00:00
John McLear	ce40cacafa	mheh looks fixed	2015-01-21 14:49:06 +00:00
John McLear	990e14c904	working with a big hack	2015-01-21 14:25:24 +00:00
John McLear	34d6b31c98	some sanity	2015-01-21 13:24:21 +00:00
John McLear	eacf1118f8	blind attempt to try	2015-01-21 02:55:03 +00:00
John McLear	c315defc31	temp bodge fix	2015-01-19 15:15:52 +00:00
John McLear	ab71bc7c20	hrm	2015-01-19 14:45:49 +00:00
John McLear	edbeb66d5e	Merge branch 'develop' of github.com:ether/etherpad-lite into develop	2015-01-19 14:33:17 +00:00
John McLear	44d1d6cc13	fix ie editing	2015-01-19 14:32:58 +00:00
Cetra Free	f1c9c58c2d	Update to timeslider to include base path for easier proxying	2015-01-19 14:28:30 +10:30
Cetra Free	3649118194	Update to timeslider to include base path for easier proxying	2015-01-19 14:25:06 +10:30
John McLear	13eff60dfe	mheh I suck at css 0ip would do a way better job of this	2015-01-19 02:13:34 +00:00
John McLear	63c65f784b	semi working example	2015-01-19 01:45:49 +00:00
John McLear	33c62329ba	better regexp for line items	2015-01-19 00:28:32 +00:00
John McLear	0bd7914c3b	dont paste on middle click of link	2015-01-18 23:58:47 +00:00
John McLear	7e69bc65ce	remove infinite load was causing pain	2015-01-18 23:03:54 +00:00
John McLear	ca6b729ace	fix for ep page view pageup/down	2015-01-18 19:58:38 +00:00
John McLear	83fae22279	allow list text entry up to 16 items	2015-01-18 15:32:48 +00:00
Stefan	3c6db077ed	Change domain for plugins.json request	2015-01-18 14:22:27 +01:00
Stefan	4644073399	Prevent dublicates in search results	2015-01-18 13:56:30 +01:00
Stefan	6d6ddd7f9f	Prevent form submit on plugin page	2015-01-18 12:15:41 +01:00
Stefan	a080b12eac	Add new favicon (32x32) with associated svg file	2015-01-11 22:40:56 +01:00
Marcel Klehr	167e0aea59	Merge pull request #2442 from ether/fix/attribmanager-removeattribonline ... Finally fix AttribManager#removeAttributeOnLine	2015-01-10 16:35:37 +01:00
webzwo0i	82efcdb430	fix for uls without class	2015-01-09 02:04:03 +01:00
Marcel Klehr	751adb24fd	Finally fix AttribManager#removeAttributeOnLine ... return safely if the attribute wasn't found. fixes #2394	2015-01-05 18:38:34 +01:00
John McLear	230302b132	fix timeslider stars and frontend tests, needs css polish	2015-01-01 22:40:45 +00:00
John McLear	8eb723b906	patch for e1c683be3f	2014-12-31 14:16:10 +00:00
John McLear	036b7d2890	Merge pull request #2418 from ether/etherpad-export-and-import ... Full Pad portability (Export/Import)	2014-12-31 13:32:09 +00:00
John McLear	b5c671a9b6	Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs ... Clean-up after removing list attribute: Remove list numbering attribute	2014-12-31 13:19:24 +00:00
John McLear	335bf3dc4a	more line polish	2014-12-31 01:46:53 +00:00
Marcel Klehr	cfe75c7f3f	Clean-up after removing list attribute: Remove list numbering attribute	2014-12-30 17:45:26 +01:00
Stefan	c20a7e9bce	Merge pull request #2406 from Gared/fix/author-not-set-callback ... Fix missing callback of #2400 and ignore missing author on timeslider on client-side	2014-12-30 14:55:49 +01:00
Stefan	5df638bfac	Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected ... Notify user if cookies can't be created	2014-12-30 14:54:43 +01:00
John McLear	19c78212e8	Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished ... Fix lineassembler not finished	2014-12-30 12:19:04 +01:00
John McLear	a07d1722fc	no errors on chrome client	2014-12-30 12:12:24 +01:00
John McLear	a2262c56b9	msg for user	2014-12-29 22:05:14 +01:00
John McLear	3773b6346b	semi working requires browser refresh	2014-12-29 20:57:58 +01:00