110 Commits

Author	SHA1	Message	Date
yflory	4278ac7637	Merge branch 'soon' into fileManager	2017-01-10 15:07:48 +01:00
ansuz	1c3f1a15cd	make sure that /pad is resized after loading	2017-01-09 17:02:01 +01:00
yflory	1e70af0c16	Use the same network for the apps and the file store	2017-01-06 13:52:53 +01:00
ansuz	5cd714b18a	configure filestore usage via customize/application_config.js	2017-01-03 12:10:11 +01:00
ansuz	91a806ab86	focus on OK button when we pop an alert	2016-12-29 17:10:59 +01:00
ansuz	89e5830409	make alertify display time configurable	2016-12-28 17:13:00 +01:00
ansuz	5e1d8292c5	guard against trying to parse special fragments	2016-12-26 14:23:17 +01:00
ansuz	52a593c2c2	fix jshint complaints	2016-12-22 17:27:56 +01:00
ansuz	53a4d4738a	really make sure you're logged out	2016-12-22 17:22:32 +01:00
ansuz	5534da8abf	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login	2016-12-22 16:54:51 +01:00
yflory	9b6c9e3891	Add support for templates in the file manager	2016-12-22 16:53:38 +01:00
yflory	87abfff66b	Fix Flash Of Unstyled Content (fouc)	2016-12-21 18:33:21 +01:00
ansuz	1682d23c1c	remove old user prototype	2016-12-21 18:06:05 +01:00
yflory	c359c27997	Use user object as default store in file manager	2016-12-20 17:27:45 +01:00
ansuz	bd6992da0a	create a random hash	2016-12-20 11:13:15 +01:00
ansuz	2cd50498c2	add log(in|out) functions to common	2016-12-20 11:11:40 +01:00
ansuz	7df460c766	implement createChannelId api	2016-12-19 14:55:39 +01:00
ansuz	5a14db9f07	Merge branch 'test-filemanager' into login	2016-12-19 12:37:28 +01:00
yflory	5bc7766f44	Use a consistent toolbar across all apps	2016-12-16 18:35:49 +01:00
ansuz	2968488278	convert uint8 arrays to hex	2016-12-16 15:18:06 +01:00
yflory	8e6830d080	Fix file manager with a chosen hash	2016-12-12 18:24:45 +01:00
yflory	ee56f5608f	Fix the infinite spinner bug with the file manager store	2016-12-08 18:52:36 +01:00
yflory	43ccd11adc	Merge branch 'infiniteSpinner' into fileManagerMerge	2016-12-08 16:03:18 +01:00
yflory	05fd6c1563	Fix the infinite spinner problem	2016-12-08 16:01:46 +01:00
yflory	cb43eb9ca1	Merge branch 'newpoll' into fileManagerMerge	2016-12-07 16:59:43 +01:00
yflory	9b3719e0ae	Merge branch 'soon' into fileManagerMerge	2016-12-07 16:59:32 +01:00
yflory	90804ed9e0	Add usernames/userlist in the toolbar and fix publish button	2016-12-01 18:40:09 +01:00
yflory	5a5451d94c	Sort elements in the trash, add properties in the context menu, fix issue with Edge	2016-11-23 18:21:45 +01:00
yflory	a957b72598	Create a new pad from the file manager	2016-11-21 18:49:13 +01:00
yflory	d6e1215166	Refresh the directory if needed when the object has changed	2016-11-18 17:17:48 +01:00
yflory	118829617f	Use the FS store as default store	2016-11-17 18:27:55 +01:00
ansuz	c2770a7a74	set correct hash even if browser does not implement replaceState	2016-11-07 15:03:17 +01:00
ansuz	303c65f2c3	use replaceState if available, instead of setting the hash	2016-11-07 11:20:30 +01:00
ansuz	2d5448458b	export messages	2016-11-03 12:45:11 +01:00
ansuz	d512b113cd	address failure to parse url when hash is not present	2016-11-02 18:28:19 +01:00
yflory	3d74290c7d	Merge branch 'usability5' into staging	2016-10-24 18:33:10 +02:00
yflory	9e92a597b3	Ability to edit the title in the toolbar by clicking it	2016-10-24 18:32:43 +02:00
ansuz	a8612ed1c7	Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging	2016-10-24 14:54:35 +02:00
Yann Flory	10bb5e1607	Add the title in the toolbar	2016-10-21 18:16:27 +02:00
Yann Flory	1e003b13a8	ask anonymous, first-time users to set their name when they first join a pad	2016-10-21 15:17:15 +02:00
yflory	39bbf8a6c1	Fix the new userlist button and make the toolbar responsive	2016-10-13 14:24:59 +02:00
yflory	24fbe22c9d	Improve the toolbar style and the way the userlist is displayed	2016-10-12 18:40:26 +02:00
yflory	91b4446c0b	Merge branch 'fix-chrome-style-bug' into soon	2016-10-10 17:07:50 +02:00
ansuz	bb2317d8e6	fix chrome style bug by forcing reload of style sheet	2016-10-07 17:41:52 +02:00
yflory	765498e88e	Remove the support for old.cryptpad.fr	2016-10-07 10:39:48 +02:00
yflory	c322aa440e	Fix the username icon hcih was not working anymore	2016-10-05 18:19:52 +02:00
yflory	8575f3f79f	Fix the "rename" feature which was not working anymore in some cases	2016-10-05 17:22:56 +02:00
yflory	a989b51d74	Fix race conditions with Alertify	2016-10-05 16:04:21 +02:00
yflory	74df38f94f	Fix race conditions that could prevent applications from being loaded	2016-10-05 11:19:18 +02:00
ansuz	dbc8f01b8b	fix merge errors and reach full jshint compliance	2016-10-04 16:58:10 +02:00