40 Commits

Author	SHA1	Message	Date
yflory	04a04aef2b	Add setAttribute/getAttribute in secure iframes. Store attributes in settings	2017-09-06 16:05:20 +02:00
yflory	53eb9bb541	Remove the logo from the filepicker loading screen	2017-09-05 15:34:38 +02:00
yflory	78b338c379	Merge branch 'code2' into staging	2017-09-05 11:38:17 +02:00
ansuz	72ef730f23	implement tag-related functions	2017-08-31 18:06:26 +02:00
yflory	f54dc7505c	Migrate indentation settings to a settings subobject	2017-08-30 17:19:50 +02:00
ansuz	542d0cd17f	drop support for legacy pad list	2017-07-31 15:34:56 +02:00
yflory	5b5a7ab286	Hide the friend button when the resquest is accepted	2017-07-06 12:31:31 +02:00
ansuz	e353627204	log users out if they do not have curve keys. add curve keys to object on registration and login.	2017-07-05 17:19:28 +02:00
yflory	43ac71603c	Move pad attributes in pad data	2017-07-05 12:26:42 +02:00
yflory	b153dda6ff	Add avatars in the user list	2017-06-30 16:57:23 +02:00
yflory	6c94605b9b	File upload in the profile	2017-06-28 10:59:29 +02:00
yflory	9cc25d4c9f	Merge branch 'staging' into newDrive	2017-06-09 17:03:01 +02:00
yflory	c1402fbb0a	Lint error	2017-06-09 15:56:18 +02:00
yflory	fd88162624	Merge branch 'staging' into newDrive	2017-06-09 14:47:37 +02:00
yflory	9694272083	Fix html code not parsed	2017-06-09 14:42:55 +02:00
yflory	9ca10ba524	Merge branch 'staging' into newDrive	2017-06-09 14:40:26 +02:00
yflory	df5cbfb53e	Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon	2017-06-09 14:36:38 +02:00
yflory	6a96aa6819	Disconnect the network when migrating the drive in another tab	2017-06-09 14:36:35 +02:00
yflory	2a94bdaf05	test	2017-06-09 13:41:11 +02:00
yflory	f8c69573fd	Disconnect other tabs when migrating the drive	2017-06-09 12:23:28 +02:00
yflory	b0fe04381d	Merge branch 'staging' into newDrive	2017-06-08 18:14:31 +02:00
yflory	1c2ea04f11	Drive refactoring	2017-06-08 17:52:00 +02:00
ansuz	3f3d64992d	resolve merge conflicts	2017-05-26 12:44:58 +02:00
ansuz	57017c68fa	hacks for cross-domain safari	2017-05-26 12:42:12 +02:00
ansuz	d9f7470f06	copy user details into sessionStorage for safari	2017-05-24 18:28:16 +02:00
yflory	0f13198119	Move the parseHash code into parsePadUrl	2017-05-12 16:33:45 +02:00
ansuz	42dcfb9661	unceremoniously kick web clients when you 'log out everywhere'	2017-05-05 18:25:55 +02:00
ansuz	3a338e0890	fix undefined reference	2017-05-05 15:20:41 +02:00
ansuz	a173e4c7a0	add 'log out everywhere' functionality in settings	2017-05-05 15:09:07 +02:00
ansuz	78b11584f8	remove unused variables	2017-05-04 16:16:09 +02:00
yflory	520dabe094	Remove the unsorted files category	2017-04-26 18:46:40 +02:00
ansuz	2a25afae5f	Merge branch 'soon' into staging	2017-04-18 12:24:45 +02:00
Caleb James DeLisle	c341fa8e94	Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter	2017-04-18 12:14:32 +02:00
ansuz	da69c1822c	ask users to sign back if signing keys are missing	2017-04-18 11:58:41 +02:00
yflory	daabb0b3ad	Integrate and fix the new fileObject (userObject)	2017-04-13 14:06:40 +02:00
yflory	c1e0316d43	Refactor fileObject	2017-04-12 18:54:22 +02:00
yflory	cde724399c	Pin the pads	2017-04-11 14:53:44 +02:00
ansuz	40f5e1706f	add a unique id to user objects, define a getter	2017-03-24 12:17:49 +01:00
ansuz	298725b3c2	don't show usage tips on error screens	2017-03-15 18:58:39 +01:00
yflory	404fa378e6	Move the store to the 'common' folder, it is not customizable anymore	2017-03-08 16:47:38 +01:00