17 Commits

Author	SHA1	Message	Date
yflory	1131ef0172	Fix language selection in sandboxed iframes	2017-09-18 14:26:54 +02:00
yflory	1091e0b375	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-09-14 11:52:52 +02:00
yflory	c50c297490	Fix the size of the loading screen for the filepicker	2017-09-14 11:03:39 +02:00
Caleb James DeLisle	5f0383ae99	update version of sframe-boot because it was changed	2017-09-14 10:52:25 +02:00
Caleb James DeLisle	710418f42f	Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed	2017-09-13 16:04:01 +02:00
Caleb James DeLisle	789a923792	Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter	2017-09-13 14:47:50 +02:00
yflory	5bf966633c	Merge branch 'staging' into slide2	2017-09-08 18:21:38 +02:00
ansuz	a302ee5d25	guard against undefined arguments	2017-09-08 17:39:41 +02:00
yflory	05793c220c	Fix secure iframes on Edge	2017-09-08 15:55:01 +02:00
ansuz	e950ce74cb	focus on input when opening filepicker	2017-09-08 15:01:47 +02:00
yflory	53eb9bb541	Remove the logo from the filepicker loading screen	2017-09-05 15:34:38 +02:00
yflory	904936209a	Remove loading tips in the file picker	2017-09-05 11:59:42 +02:00
yflory	204e45dfae	Enable templates in pad	2017-09-05 11:57:44 +02:00
yflory	d2787e3eff	Make code2 the default code app	2017-09-05 11:36:02 +02:00
yflory	86e23ac19f	Use less2 in secure iframes	2017-09-04 15:09:54 +02:00
yflory	f12f4bb925	Integrate filepicker secure iframe in the code2 app	2017-09-01 15:17:14 +02:00
yflory	89b7b644f3	Enable drag & upload in code2 and prepare filepicker	2017-08-31 16:32:26 +02:00