844 Commits

Author	SHA1	Message	Date
Nicolas Lemoine	658b00814b	TodoApp - Style and translations	2017-07-23 16:08:49 +03:00
ansuz	dcf5719eaf	handle most of the boilerplate stuff	2017-07-23 14:27:47 +02:00
ansuz	6622735db0	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-07-22 14:15:15 +02:00
ansuz	55cb0734e2	make bad state timeout configurable	2017-07-22 10:56:39 +02:00
yflory	a80b00a765	Move the file picker in common	2017-07-20 18:32:03 +02:00
yflory	9633025afe	CSS for the removeHistory button in contacts	2017-07-20 17:26:33 +02:00
ansuz	b22127f10c	add history removal	2017-07-20 15:55:04 +02:00
yflory	c33d2a2db0	New tooltips	2017-07-19 17:14:10 +02:00
yflory	82c87144cb	Remove the friend request button when the request is sent	2017-07-19 14:14:34 +02:00
yflory	1dc98dcff1	CSS for the contacts input field	2017-07-19 10:30:38 +02:00
yflory	26fa914982	Missing translation keys	2017-07-18 11:07:34 +02:00
Pierre Bondoerffer	a2c2e98060	Spanish update	2017-07-18 10:30:28 +02:00
yflory	6aab1c94b2	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-07-18 10:24:00 +02:00
yflory	baf439648e	Add the contacts app in the dropdown menu	2017-07-18 10:22:51 +02:00
ansuz	5716f76c91	fix typo in translations	2017-07-18 10:04:02 +02:00
yflory	743b87b70f	Add initial text in /contacts	2017-07-17 18:51:23 +02:00
yflory	aa8181ab2b	Contacts app translations	2017-07-17 18:34:46 +02:00
ansuz	0cd94e2ba8	add title to contacts app	2017-07-17 17:38:41 +02:00
ansuz	f2320190b8	change friends url to /contacts/	2017-07-17 17:18:28 +02:00
ansuz	06c971ec47	s/friend/contact/g	2017-07-17 15:52:13 +02:00
ansuz	2e0aa185cd	uppercase first letter of new translation keys	2017-07-17 14:12:05 +02:00
ansuz	6306de5265	set avatar border-radius to 4px	2017-07-17 13:43:51 +02:00
ansuz	33dcd2ae28	drop black border from avatars in userlist	2017-07-17 11:08:20 +02:00
ansuz	e2c17dbeb4	resolve conflicts	2017-07-13 17:52:00 +02:00
yflory	557f13f796	Unfriend and update username - beta	2017-07-13 17:32:57 +02:00
ansuz	7be1e249e1	add fa-share-alt to pad initialText	2017-07-13 15:48:03 +02:00
ansuz	96d2ff67e1	user-plus as icon for add-friend	2017-07-13 15:22:11 +02:00
ansuz	bf9c2b0b84	new messages	2017-07-13 12:29:49 +02:00
yflory	ac684a8dc7	Use the APP toolbar in profile	2017-07-12 18:34:16 +02:00
yflory	2d509e3e25	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-07-12 14:34:57 +02:00
yflory	b3e225cb3b	Replace spinner by text and fix mobile UI	2017-07-12 14:33:28 +02:00
ansuz	3453e54357	bump footer and package.json for upcoming version	2017-07-12 10:49:05 +02:00
yflory	42075e4b5f	Make everything 16px and 32px	2017-07-11 15:34:46 +02:00
yflory	16d0527e92	Add a page title in drive, settings and file	2017-07-11 15:13:39 +02:00
yflory	5d5f936682	Hide the upload table in code	2017-07-11 14:38:26 +02:00
yflory	a0b14faf89	Fix the font in settings and drive	2017-07-11 13:11:16 +02:00
yflory	112c4c85e5	Left menu in drive	2017-07-11 12:47:15 +02:00
yflory	59213a9c4e	Typo	2017-07-11 11:18:13 +02:00
yflory	560671ae7d	Make avatars circle	2017-07-10 18:46:26 +02:00
yflory	125018c8c3	New settings page	2017-07-10 18:29:23 +02:00
yflory	c02fa39524	Make drive search bar blue	2017-07-10 15:19:08 +02:00
yflory	0157e04b10	Fix overflowing content in the home page	2017-07-10 14:05:12 +02:00
yflory	e6188bfb63	Fix useradmin dropdown position	2017-07-10 12:38:54 +02:00
yflory	e8f3df5a46	Clean less	2017-07-10 11:57:04 +02:00
yflory	159d72f33b	Merge branch 'msg' into staging	2017-07-10 11:48:22 +02:00
yflory	8e2e8b1653	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-07-10 11:46:16 +02:00
yflory	ff10c282d4	Avatar in the user admin button	2017-07-10 11:46:06 +02:00
ansuz	52eb8e307c	feedback for language used	2017-07-10 10:59:32 +02:00
ansuz	086e5909dd	Merge branch 'soon' into staging	2017-07-10 10:43:41 +02:00
ansuz	4a37bc4a1c	abort the realtime session if it does not synchronize for 30 seconds	2017-07-10 10:34:25 +02:00