35 Commits

Author	SHA1	Message	Date
yflory	bf9cf95292	Merge branch 'staging' into oo2	2018-09-03 10:49:12 +02:00
yflory	921e6eb3c3	Fix wrong pad title in drive	2018-06-11 10:58:44 +02:00
yflory	a9d01ac864	Lock the UI when someone is editing	2018-04-03 11:00:46 +02:00
yflory	f1c1d87d3f	Fix template importer	2018-03-23 10:53:31 +01:00
yflory	728a6a868d	Manage expired channels	2018-02-13 18:20:13 +01:00
yflory	ee605183e5	Make sure we don't have duplicates in the webchannel members	2018-01-15 15:40:52 +01:00
yflory	5c3237e093	Fix issues with the async store	2017-11-30 17:21:58 +01:00
Caleb James DeLisle	6dbc02e81a	Merge branch 'staging' into framework	2017-09-27 12:01:18 +02:00
Caleb James DeLisle	90d00c10b1	Make metadata-manager a bit more robust	2017-09-27 11:56:25 +02:00
yflory	456370b1aa	Base for Drive in sandboxed iframe	2017-09-21 17:59:26 +02:00
yflory	d2787e3eff	Make code2 the default code app	2017-09-05 11:36:02 +02:00
yflory	0ce32464fd	Fix flickering avatar in firefox	2017-08-30 12:26:11 +02:00
yflory	901917983b	Fix an issue preventing pads to be stored in the drive	2017-08-29 11:02:56 +02:00
yflory	88cb4fd83c	Enable friend requests from secure pads	2017-08-28 16:21:05 +02:00
yflory	e43c68aa48	Fix viewers number in secure iframe	2017-08-28 15:13:16 +02:00
yflory	f40d2c0b20	Add templates to pad2	2017-08-21 18:21:53 +02:00
yflory	30aef71603	Enable avatars in pad2	2017-08-21 12:01:38 +02:00
yflory	90f892de9c	Useradmin menu, notifications and share button in pad2	2017-08-18 16:34:41 +02:00
yflory	a96d447e8b	Add notifications in pad2	2017-08-18 10:47:30 +02:00
Caleb James DeLisle	cf6d8c83b2	Fix title setter logic and separate it from UI	2017-08-17 19:58:48 +02:00
Caleb James DeLisle	ec87f3f897	Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2	2017-08-17 19:01:40 +02:00
Caleb James DeLisle	415399ef64	Changes to support title change in metadata	2017-08-17 19:01:33 +02:00
yflory	d1affebd14	Title in pad2	2017-08-17 19:01:03 +02:00
Caleb James DeLisle	909bda4302	This should fix laxy metadata	2017-08-17 18:26:58 +02:00
yflory	f5855a2870	Add account name in metadata manager	2017-08-17 16:25:25 +02:00
yflory	d88704fb50	Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2	2017-08-17 15:44:41 +02:00
Caleb James DeLisle	a4850a7fcc	Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2	2017-08-17 15:42:28 +02:00
yflory	fc5bdd3bed	Add lazy metadata to fix parse errors in pad2	2017-08-17 15:42:26 +02:00
Caleb James DeLisle	ad9f2ff223	Made pad2 server more generic and easy to implement	2017-08-17 15:41:04 +02:00
yflory	fb512c8923	Toolbar in pad2	2017-08-17 14:55:44 +02:00
Caleb James DeLisle	33e73dd5e5	fixed one last fight	2017-08-10 21:40:34 +02:00
Caleb James DeLisle	1e56fa31c0	yay, they talk and they don't fight	2017-08-10 18:31:44 +02:00
Caleb James DeLisle	0dde1d7507	wip	2017-08-10 14:49:21 +02:00
Caleb James DeLisle	c304071492	wip	2017-08-09 17:37:55 +02:00
Caleb James DeLisle	4b25ab80d6	wip	2017-08-09 14:45:39 +02:00