127 commits

Author	SHA1	Message	Date
Stefan	f6456c0aa7	Merge pull request #3187 from tiblu/ep_prefs_different_cookie_for_different_protocol ... #3179 - Using EP on same domain, but over different protocols causes "Warning: it appears that your browser does not have cookies enabled.	2017-07-30 11:49:29 +02:00
Jan Holub	8bd8be97b9	Added support for the Montserrat Font as discussed in #3201 (#3205) ... * Added support for the Montserrat Font as discussed in #3201 I chose a thin version of the Font (namely Montserrat Light) as the regular font and Montserrat Regular as the bold version. The thin fonts just look better in my opinion.	2017-07-12 12:21:48 -03:00
Luiza Pagliari	8c57c8d0d6	Merge pull request #3206 from 00SteinsGate00/RobotoMono ... Added RobotoMono as a more modern and pretty monospaced font	2017-07-12 08:02:08 -03:00
Jan Holub	7029248a76	Added RobotoMono as a more modern and pretty monospaced font, addressing #3201 ... I added RobotoMono-Regular and RobotoMono-Bold as TrueTypeFont files and included them into the list. I tred to stay in alphabetical order where possible. The author of #3201 was asking for a more modern monospaced font.	2017-06-21 23:44:23 +02:00
Mikk Andresen	c959cdbaa7	Pad_cookie.js to have isCookiesEnabled() cause wasNoCookie() is also true when User visits first time.	2017-05-05 11:17:07 +03:00
Mikk Andresen	582e2c3819	Use padcookie instead of raw prefs cookie reading	2017-05-05 11:07:54 +03:00
Luiza Pagliari	0bd4169663	[fix] Block user from changing pad after he/she is disconnected ... Use same approach of when channel state is chaged to "DISCONNECTED".	2017-05-03 12:59:57 -03:00
Stefan	8084400e13	Try to init cookies before testing if it exists	2016-12-20 21:57:01 +01:00
Stefan	aefa617797	Merge branch 'develop' into improve_cookies	2016-12-20 21:31:11 +01:00
Stefan	39a3bedb7b	Updated option parameters for socket.io to work with latest version	2016-11-20 12:27:27 +01:00
Luiza Pagliari	c92e3e4b5e	Fix #2918. Re-enable editor after user is reconnected to server	2016-07-21 15:23:14 -03:00
Stefan	009b61b338	Make express-session cookie scheme dependent	2016-07-10 12:44:45 +02:00
Stefan	93dae51cda	Remove test cookie	2016-06-08 21:12:27 +02:00
Brian Lim	49d38522b1	Timeslider Not Translated Issue 2885	2016-01-20 02:30:25 -05:00
John McLear	50c6b5ed61	tidy up	2016-01-10 14:39:41 +00:00
John McLear	793b34d17b	hrm, removal	2016-01-08 13:39:32 +00:00
John McLear	f16616d23b	seems to work	2016-01-08 13:26:46 +00:00
John McLear	34a46d6318	should be clean enough to push	2015-12-23 14:35:52 +00:00
Stefan	856fc5975b	Fix broken switchToPad method	2015-08-05 18:23:54 +02:00
goldquest	32ba48835a	if variable not declared, test if null throws error	2015-06-17 18:54:19 +02:00
John McLear	5a5d245c06	fix issues with redrawing focus back to input element would lose param selected name	2015-06-08 17:13:46 +01:00
John McLear	0eb8b800cf	hide chat if its already open on readonly mode	2015-05-20 01:50:37 +01:00
John McLear	3944a0e79b	more read only mode fixes andadd support for handleMessageSecurity hook	2015-05-20 01:05:53 +01:00
John McLear	fe7ab21c84	dont allow chat input or name input on read only pads	2015-05-19 17:52:43 +01:00
John McLear	3b91b46baa	always hide connected one second after connected	2015-05-10 11:46:49 +01:00
John McLear	48c2b7cde1	fixes #2570	2015-05-05 20:41:40 +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	41bb4ef094	support for open dyslexic font	2015-04-05 14:03:09 +01:00
John McLear	e9d8c3b53a	expose method for getting a full user list on the client including historical data	2015-03-31 20:26:55 +01:00
John McLear	f9071aebe6	fix issue with showControls false not working	2015-03-30 14:56:35 +01:00
John McLear	be73e729d4	remove console log	2015-03-25 12:25:33 +00:00
John McLear	b72127c327	different font families for people with dyslexia	2015-03-25 12:24:20 +00:00
John McLear	753e8fdf0b	working logic	2015-01-21 16:08:54 +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	f2891e3b8b	working	2015-01-21 14:55:29 +00:00
John McLear	34d6b31c98	some sanity	2015-01-21 13:24:21 +00:00
John McLear	63c65f784b	semi working example	2015-01-19 01:45:49 +00: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	248d7655d7	Merge pull request #2401 from ether/save-prefs ... set prefs and get prefs	2014-12-29 01:01:09 +01:00
John McLear	6b1fee400d	Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest	2014-12-29 00:40:07 +01:00
Gared	018821e98c	Use camel case	2014-12-28 22:20:09 +01:00
Gared	2307c6fbda	Notify user if cookies can't be created	2014-12-28 15:02:56 +01:00
John McLear	a151c207c2	set prefs and get prefs	2014-12-27 15:08:54 +01:00
Simon Gaeremynck	45c1ad078b	Allow for shardable Etherpad	2014-12-09 14:59:18 +00:00
John McLear	9b66c93d6b	swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well	2014-11-22 19:11:35 +00:00
John McLear	9712f852e9	remove connecting bar image	2014-11-18 19:16:50 +00:00
John McLear	eff4863a22	Merge pull request #2290 from ether/IE11-null-password ... change to proper IE check	2014-11-15 15:37:53 +00:00
John McLear	0685e563ed	working on resize	2014-11-06 15:43:21 +00:00
John McLear	96d6e7c1b7	cleaner reflow	2014-11-06 15:12:40 +00:00
John McLear	9170effb27	working redraw and draw on startup	2014-11-06 15:09:44 +00:00