70 Commits

Author	SHA1	Message	Date
Caleb James DeLisle	0d1f19f5d4	Big manual merge	2017-08-04 11:20:17 +02:00
Pierre Bondoerffer	f6d45d05f6	use logo in toolbar	2017-08-04 11:01:26 +02:00
ansuz	35cf23ce2c	clear tooltips when redrawing the userlist	2017-08-01 11:50:43 +02:00
ansuz	4c6f8d71e1	don't invoke spinner if it does not exist	2017-08-01 11:08:25 +02:00
ansuz	a68a225d79	fix read-only synchronization bug	2017-07-31 12:21:48 +02:00
yflory	c33d2a2db0	New tooltips	2017-07-19 17:14:10 +02:00
yflory	b56a782f01	Store the userlist state when it is closed using the icon	2017-07-19 14:38:46 +02:00
yflory	82c87144cb	Remove the friend request button when the request is sent	2017-07-19 14:14:34 +02:00
yflory	009d01abde	Fix friend removal and update user data	2017-07-17 18:07:58 +02:00
ansuz	96d2ff67e1	user-plus as icon for add-friend	2017-07-13 15:22:11 +02:00
yflory	ac684a8dc7	Use the APP toolbar in profile	2017-07-12 18:34:16 +02:00
yflory	b3e225cb3b	Replace spinner by text and fix mobile UI	2017-07-12 14:33:28 +02:00
yflory	7f5c301734	Add display name in the settings useradmin menu	2017-07-11 18:50:41 +02:00
yflory	fb21a650ce	Lint errors	2017-07-11 17:40:13 +02:00
yflory	16d0527e92	Add a page title in drive, settings and file	2017-07-11 15:13:39 +02:00
yflory	438e7e6cf9	Fix display name in useradmin (friends app)	2017-07-10 13:04:33 +02:00
yflory	159d72f33b	Merge branch 'msg' into staging	2017-07-10 11:48:22 +02:00
yflory	ff10c282d4	Avatar in the user admin button	2017-07-10 11:46:06 +02:00
yflory	a5e8f6ae81	Add friend app and fix avatar size	2017-07-06 18:00:03 +02:00
yflory	5b5a7ab286	Hide the friend button when the resquest is accepted	2017-07-06 12:31:31 +02:00
yflory	95e2efab89	Add to friend list	2017-07-05 18:42:32 +02:00
yflory	bf17ad3f1e	Friend button in the userlist	2017-07-05 15:59:36 +02:00
yflory	69f4ce2abd	Fix middle click on the drive button	2017-07-04 17:03:54 +02:00
yflory	ffd184d50e	Fix overflowing names in the new userlist	2017-07-03 17:41:34 +02:00
yflory	fa2d857d70	Fix css issues with Safari	2017-07-03 16:11:41 +02:00
yflory	335898a4c7	Hack the drawer to close it when clicking outside	2017-06-30 18:23:23 +02:00
yflory	b153dda6ff	Add avatars in the user list	2017-06-30 16:57:23 +02:00
yflory	b9320e6005	Toolbar improvements	2017-06-30 11:42:54 +02:00
ansuz	b7cb1a8d5f	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-29 17:54:29 +02:00
yflory	8279ef3130	Fix conflict between ckeditor toolbar and userlist on small screens	2017-06-29 17:51:30 +02:00
yflory	7a87775372	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-29 15:21:09 +02:00
ansuz	45f180955b	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-29 15:20:46 +02:00
yflory	56a25e1036	Small fixes for the new toolbar	2017-06-29 15:15:40 +02:00
ansuz	1179992a90	update feedback key name	2017-06-29 14:48:33 +02:00
ansuz	39149a052b	add new feedback keys	2017-06-29 14:16:20 +02:00
ansuz	5e56ad912e	remove the last bit of compiled css	2017-06-28 14:51:49 +02:00
ansuz	3be6433fdf	send feedback on name changes	2017-06-27 18:06:32 +02:00
ansuz	bb74935b08	allow pin limit caching to occur at api level	2017-06-27 15:37:42 +02:00
ansuz	e9bfaa9a60	compile less clientside. remove compiled css	2017-06-27 14:25:02 +02:00
ansuz	67a096a8a4	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-27 09:57:32 +02:00
ansuz	7b37146034	don't let spacebar keyups propagate outside of the title	2017-06-26 18:32:29 +02:00
ansuz	9195c0cd12	is isOverPinLimit in toolbar	2017-06-26 18:13:06 +02:00
yflory	33ea8cb183	Make sure we don't call both the yes and no handlers in prompts	2017-06-26 16:23:55 +02:00
yflory	cc341ca6d4	Lint error	2017-06-23 17:57:29 +02:00
yflory	0d4d104e08	Mobile support for the new toolbar	2017-06-23 17:56:14 +02:00
yflory	2710279904	Use the new share button in the file app	2017-06-22 17:03:51 +02:00
yflory	684269fdda	Userlist in polls	2017-06-22 16:14:54 +02:00
yflory	13288ee18b	Update the userlist in code, slide and pad	2017-06-22 15:52:25 +02:00
yflory	92b6e60573	Small improvements for the new toolbar	2017-06-22 11:13:53 +02:00
yflory	8d956c3de6	New toolbar	2017-06-21 18:04:35 +02:00