1248 Commits (9615c3a4111f7f931db4ed82ed633b4bbb4d1e2c)

Author	SHA1	Message	Date
Pierre Bondoerffer	8c0fe7d277	Add missing UI element translations	2017-08-11 15:10:45 +02:00
Pierre Bondoerffer	144f9f4c83	alertify fix on mobile	2017-08-11 14:46:08 +02:00
Caleb James DeLisle	9833bd7e59	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-08-11 14:31:40 +02:00
Caleb James DeLisle	89a8e8050c	Fix typo and also change message to explain itself better	2017-08-11 14:31:31 +02:00
ansuz	64849507b3	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-08-11 14:26:34 +02:00
ansuz	328107be4d	translation key for using tabs	2017-08-11 14:26:08 +02:00
Pierre Bondoerffer	b00d37d9e7	proper namespace for font	2017-08-11 14:14:58 +02:00
Pierre Bondoerffer	0f74dffc48	fix register button being cut off	2017-08-11 14:11:50 +02:00
Pierre Bondoerffer	92d3b1a9fc	actually pull in open-sans, move fonts to own include	2017-08-11 14:10:54 +02:00
ansuz	958294f109	put code settings in their own tab	2017-08-11 13:00:50 +02:00
ansuz	ae0b2ca1a8	add label for code indentation	2017-08-11 12:55:10 +02:00
ansuz	7f2b7fc287	show Your CryptDrive, if logged in. fix typos	2017-08-11 11:32:21 +02:00
Pierre Bondoerffer	ef256e3849	go to homepage when on infopages	2017-08-10 15:17:34 +02:00
Pierre Bondoerffer	04b84538e1	add Open Sans font (with bower)	2017-08-10 15:05:57 +02:00
Caleb James DeLisle	8efac4e661	Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging	2017-08-10 14:49:41 +02:00
Pierre Bondoerffer	baf64114a6	point to homepage in drive	2017-08-10 14:45:56 +02:00
Caleb James DeLisle	1043e076a4	Merge branch 'ui-integration' into staging	2017-08-09 17:47:02 +02:00
CatalinScr	41c2f9bd83	Changed the footer, a modified the about page	2017-08-09 18:35:36 +03:00
Pierre Bondoerffer	edad5deeac	fix logo not showing sometimes in chrome	2017-08-09 16:06:29 +02:00
Pierre Bondoerffer	c036bb26be	use proper bootstrap class	2017-08-09 15:46:17 +02:00
Pierre Bondoerffer	b34e252eda	improve whiteboard styles	2017-08-09 14:43:32 +02:00
Pierre Bondoerffer	8b2cb37c2f	improve poll looks	2017-08-09 12:33:40 +02:00
Pierre Bondoerffer	280c10c57d	alertify: use the right box-shadow	2017-08-09 11:48:04 +02:00
Pierre Bondoerffer	82352b422f	unhide show help button	2017-08-09 11:24:28 +02:00
Pierre Bondoerffer	ec011b15d5	remove duplicate css property	2017-08-09 10:55:36 +02:00
Pierre Bondoerffer	34ba673cd3	improve file upload UI	2017-08-09 10:54:20 +02:00
Pierre Bondoerffer	ca686f9c92	(hopefully) fix newline in lists when pasting links	2017-08-08 17:47:10 +02:00
Pierre Bondoerffer	6ca6755d02	more missing titles in toolbar	2017-08-08 16:51:23 +02:00
Pierre Bondoerffer	2cc6c636db	Add some missing titles	2017-08-08 16:20:31 +02:00
Pierre Bondoerffer	355b7f1839	change recent to local pads	2017-08-08 12:05:22 +02:00
Pierre Bondoerffer	90075cd48e	media-tag to less file	2017-08-08 12:01:39 +02:00
Pierre Bondoerffer	88be5444f0	change alertify warn color	2017-08-08 10:37:37 +02:00
Pierre Bondoerffer	c53e738054	improve file picker ui	2017-08-07 16:27:29 +02:00
Pierre Bondoerffer	996c56c242	fix label in register	2017-08-07 11:41:04 +02:00
Pierre Bondoerffer	008fa12755	alertify: add textarea + checkbox	2017-08-07 11:26:40 +02:00
Pierre Bondoerffer	e486e47aa1	alertify: fix input color + better log styles	2017-08-07 11:19:20 +02:00
Pierre Bondoerffer	e333e7903d	fix styles overlapping	2017-08-04 17:44:02 +02:00
Pierre Bondoerffer	1db41dd17b	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-04 17:15:55 +02:00
Pierre Bondoerffer	dac14de18c	unify fonts	2017-08-04 17:15:45 +02:00
CatalinScr	5afadf10aa	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-04 17:58:48 +03:00
CatalinScr	3f6b234e97	Styled the general menu, footer, updated about	2017-08-04 17:58:29 +03:00
Pierre Bondoerffer	a16d4be3c4	show logged in user	2017-08-04 16:48:01 +02:00
Pierre Bondoerffer	8a56adfe53	make logos same size, compress	2017-08-04 16:25:39 +02:00
Pierre Bondoerffer	d3fb6313b6	color logo on topbar	2017-08-04 16:22:43 +02:00
Pierre Bondoerffer	865ba0731c	better colors? not sure yet...	2017-08-04 16:13:27 +02:00
Pierre Bondoerffer	1bd42f0b3e	make alertify darker	2017-08-04 16:02:35 +02:00
Caleb James DeLisle	0f7124d673	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-04 15:26:59 +02:00
Pierre Bondoerffer	ecc766eb7b	remove useless margin	2017-08-04 15:24:58 +02:00
Caleb James DeLisle	a6547d1ed0	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-04 15:20:14 +02:00
Pierre Bondoerffer	7310960f46	remove the hack around the hack to fix the hack	2017-08-04 15:19:59 +02:00
Caleb James DeLisle	95c7cd3fcc	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-04 15:17:22 +02:00
Pierre Bondoerffer	addd91cc72	fix styles (again) copyright cjd 2017	2017-08-04 15:16:48 +02:00
Caleb James DeLisle	930ba8aec6	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-04 15:13:09 +02:00
Pierre Bondoerffer	5c21a9048e	fix styles	2017-08-04 15:13:03 +02:00
Caleb James DeLisle	b26c62714f	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-04 15:08:21 +02:00
Pierre Bondoerffer	c953e71a18	better class generation and remove duplicate class	2017-08-04 15:06:58 +02:00
Caleb James DeLisle	4d563af045	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-04 14:51:14 +02:00
Pierre Bondoerffer	10e50fc5c7	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-04 14:50:44 +02:00
Pierre Bondoerffer	6614f3f0e6	put the page class on html element	2017-08-04 14:50:35 +02:00
ansuz	96b12d55fb	add a return	2017-08-04 14:37:21 +02:00
ansuz	b79adf4177	redirect to drive if logged in	2017-08-04 14:35:47 +02:00
Caleb James DeLisle	a10214ed2a	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-04 14:19:54 +02:00
Caleb James DeLisle	75c0876500	Added ludovic's bio	2017-08-04 14:19:44 +02:00
CatalinScr	043ae4280b	repaired the menu	2017-08-04 15:15:47 +03:00
CatalinScr	250d85bb8a	Repaired the menu, clead the code	2017-08-04 15:15:35 +03:00
Pierre Bondoerffer	e2ad99ab3c	change favicon (again)	2017-08-04 14:06:10 +02:00
Pierre Bondoerffer	8831f4f91b	new favicons	2017-08-04 14:02:53 +02:00
Pierre Bondoerffer	a70c527482	Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page	2017-08-04 12:32:26 +02:00
Pierre Bondoerffer	4018c7e0a6	move alertify stuff	2017-08-04 12:31:47 +02:00
Caleb James DeLisle	c274a27dfb	Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js	2017-08-04 11:33:28 +02:00
Caleb James DeLisle	0d1f19f5d4	Big manual merge	2017-08-04 11:20:17 +02:00
CatalinScr	e7d09c1ddb	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page ... changed the menu	2017-08-04 12:16:33 +03:00
CatalinScr	d4ce7d626c	Modified the menu	2017-08-04 12:16:13 +03:00
Pierre Bondoerffer	f8c7140eec	make fonts big	2017-08-04 11:10:30 +02:00
Pierre Bondoerffer	f6d45d05f6	use logo in toolbar	2017-08-04 11:01:26 +02:00
Pierre Bondoerffer	1b83e15796	sorry jpg, i forgot you existed	2017-08-04 10:49:18 +02:00
Pierre Bondoerffer	5ce7d64b2c	add pierre photo	2017-08-04 10:30:19 +02:00
Caleb James DeLisle	1b466d250f	Add some photos	2017-08-03 18:01:48 +02:00
Caleb James DeLisle	5d70dd93b3	Manual merge	2017-08-03 17:18:03 +02:00
CatalinScr	15fa801bc8	work in progress	2017-08-03 18:09:25 +03:00
Caleb James DeLisle	bc15ce7de5	Manual merge	2017-08-03 17:00:46 +02:00
Caleb James DeLisle	52e9ba92fa	Update whitepaper link and also change whatis_zeroknowledge	2017-08-03 16:23:29 +02:00
CatalinScr	89ab82c0e2	Changed the menu, added the logo on top bar	2017-08-03 17:19:55 +03:00
Pierre Bondoerffer	ae176b0465	about page mockup	2017-08-03 15:58:51 +02:00
Pierre Bondoerffer	cdf6345fc1	use sign up	2017-08-02 17:55:05 +02:00
Pierre Bondoerffer	ddc9c4d070	alt favicon pink	2017-08-02 17:52:48 +02:00
ansuz	35867001cb	add missing messages	2017-08-02 17:38:34 +02:00
Pierre Bondoerffer	86bc14e6bb	new loading screen	2017-08-02 17:19:16 +02:00
Pierre Bondoerffer	304a29e210	Improve contact page	2017-08-02 16:34:35 +02:00
Pierre Bondoerffer	d6679e8ef3	Add screenshots to What is CryptPad	2017-08-02 15:53:04 +02:00
Pierre Bondoerffer	b3f3f1dabb	Add What is CryptPad keys	2017-08-02 14:57:27 +02:00
Pierre Bondoerffer	e2f8c9c5da	add logo to topbar	2017-08-02 12:37:56 +02:00
Pierre Bondoerffer	8a56029bfe	remove useless images	2017-08-02 11:56:00 +02:00
Pierre Bondoerffer	ea3a8932be	put the content in the right place	2017-08-02 11:50:35 +02:00
Pierre Bondoerffer	262a729ef7	use proper key name	2017-08-02 11:48:30 +02:00
Pierre Bondoerffer	db111257f0	Add translations, remove useless functions	2017-08-02 11:46:55 +02:00
Pierre Bondoerffer	de23195bd8	fix wrong css class	2017-08-02 11:26:02 +02:00
Pierre Bondoerffer	ad4aca4e5f	actually do the changes intended in previous commit	2017-08-02 11:22:52 +02:00
Pierre Bondoerffer	01b2883771	Add headers and footers, generate what-is-cryptpad	2017-08-02 11:20:07 +02:00
Pierre Bondoerffer	cd0c9cc95a	create less templates for info pages	2017-08-02 11:08:36 +02:00
Pierre Bondoerffer	f71b082aac	remove min-height globally, style footer	2017-08-02 11:00:42 +02:00
Pierre Bondoerffer	0fe49d6641	oops, sorry, back to 100% height	2017-08-01 17:26:47 +02:00
Pierre Bondoerffer	dc0a037894	turn login and register into infopages	2017-08-01 17:11:03 +02:00
Pierre Bondoerffer	549b1b2c4f	Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page	2017-08-01 14:35:50 +02:00
Pierre Bondoerffer	775ea81504	start register page	2017-08-01 14:35:45 +02:00
CatalinScr	69c470330f	updated the favicons, changed the menu ... PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,	2017-08-01 15:21:07 +03:00
CatalinScr	e609950977	Changed the favicon, added the boostrap js file, reconfigure the top menu	2017-08-01 15:20:29 +03:00
Caleb James DeLisle	27aa1886b1	Move footer to pages.js and add it to the contact page	2017-08-01 14:17:02 +02:00
Caleb James DeLisle	490e2b4d0a	work in progress on migrating styles back into the infopages.less	2017-08-01 13:49:42 +02:00
Caleb James DeLisle	cd2b41f51e	Fix up some less for supporting the info-pages	2017-08-01 11:53:06 +02:00
Caleb James DeLisle	896186d059	Fix some wrong less files which were breaking the UI of the apps	2017-08-01 11:19:32 +02:00
ansuz	4614d6ae81	remove legacy max-width from usage bar	2017-08-01 10:05:54 +02:00
CatalinScr	87dec4a091	Changed the font size	2017-07-31 19:24:07 +03:00
CatalinScr	5ef0325d90	this are css rules modified -- INSERT --	2017-07-31 19:14:15 +03:00
CatalinScr	5921073524	Updated the new font, changed the logo, changed see more	2017-07-31 19:13:45 +03:00
Pierre Bondoerffer	ba95931802	Use translation keys	2017-07-31 17:53:31 +02:00
ansuz	9a733cca0e	drop support for legacy iframe	2017-07-31 17:30:19 +02:00
Pierre Bondoerffer	f2a78ddfd9	New FR/ES keys	2017-07-31 16:55:09 +02:00
CatalinScr	6862bda454	Changed the logo, uploaded the new font, repaired responsive	2017-07-31 17:04:37 +03:00
ansuz	1ca00e7e01	resolve merge conflicts	2017-07-31 16:00:45 +02:00
ansuz	411c64df85	Merge branch 'master' into master	2017-07-31 15:49:54 +02:00
Pierre Bondoerffer	93e007b52a	reduce png sizes	2017-07-31 15:11:35 +02:00
ansuz	777dea2014	Merge branch 'staging' into todo	2017-07-31 11:43:56 +02:00
ansuz	a458d7fa46	bump to latest version	2017-07-31 10:24:35 +02:00
Caleb James DeLisle	428bee6306	make links clickable and make more link work	2017-07-26 15:53:10 +02:00
ansuz	ba9cab762c	Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo	2017-07-26 13:29:33 +02:00
yflory	459e0b3b16	CSS and bug fixes for todo	2017-07-26 13:30:39 +02:00
ansuz	a5b19b1cdd	add missing translations	2017-07-26 13:27:34 +02:00
yflory	77d6da841f	Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo	2017-07-26 13:07:41 +02:00
yflory	3da76e3ae8	Update style for the todo app	2017-07-26 13:07:35 +02:00
ansuz	8cfd8d3270	add translations for todo	2017-07-26 13:02:14 +02:00
CatalinScr	5fa20836cf	Modified Register and login button	2017-07-26 10:38:01 +03:00
CatalinScr	cab8716519	Changed the login button, repaired the hover menu and see more. Updated the logo	2017-07-25 01:08:53 +03:00
CatalinScr	796bf89491	Update of the front-page	2017-07-24 17:56:54 +03:00
Caleb James DeLisle	49c760131e	wip	2017-07-24 14:10:40 +02:00
Nicolas Lemoine	658b00814b	TodoApp - Style and translations	2017-07-23 16:08:49 +03:00
c4rl0sc	2e8e44933a	Fixed spelling error in Spanish translation	2017-07-23 14:31:12 +02:00
ansuz	dcf5719eaf	handle most of the boilerplate stuff	2017-07-23 14:27:47 +02:00
c4rl0sc	064e189495	Fixed spelling issues and improved translation quality.	2017-07-23 14:16:34 +02:00
Caleb James DeLisle	6a1ec54e2a	wip	2017-07-22 17:31:40 +02:00
Pierre Bondoerffer	dc9565f22f	make buttons colorful	2017-07-22 17:30:13 +02:00
Caleb James DeLisle	8404017af1	wip	2017-07-22 16:43:53 +02:00
ansuz	76e69f0ba8	Merge pull request #127 from gustavohmsilva/master ... Merged translated and non-translated in pt-BR	2017-07-22 16:07:44 +02:00
ansuz	52fa77e961	Merge pull request #157 from MacLemon/reduce-image-asset-size ... File size reduction and optimization of new image assets	2017-07-22 16:00:12 +02:00
Gustavo H M Silva	6785f166fd	Merge branch 'master' into master	2017-07-22 09:18:12 -03: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
MacLemon	25cba8bba3	Translated missing out.presentSuccess to german	2017-07-20 20:08:30 +02:00
MacLemon	29bfcfa719	File size reduction and optimization of new image assets	2017-07-20 20:03:26 +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
Caleb James DeLisle	ffb5e555a0	Merge branch 'staging' into front-page	2017-07-20 10:09:32 +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
Caleb James DeLisle	f6abdc2b86	manual merge of staging	2017-07-13 10:30:42 +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
ansuz	c60a71e210	add connect button and view profile button	2017-07-10 09:23:58 +02:00
ansuz	6f7c60bf12	Merge pull request #154 from evalica/153 ... Issue #153: On Register, add spacing between checkboxes and labels	2017-07-07 17:17:30 +02:00
Ecaterina Moraru (Valica)	e8e8858e44	Issue #153: On Register, add spacing between checkboxes and labels	2017-07-07 17:26:34 +03:00
Ecaterina Moraru (Valica)	fc065a0484	Issue #151: Spacing between "Log-in" and "Register" buttons ... - Removed ".first" class from Register button - Increase spacing between buttons	2017-07-07 17:04:26 +03:00
yflory	a5e8f6ae81	Add friend app and fix avatar size	2017-07-06 18:00:03 +02:00
ansuz	f02285d103	fix lowercased p	2017-07-06 10:49:33 +02:00
Pierre Bondoerffer	56ed1dd457	spanish update	2017-07-06 10:13:56 +02:00
ansuz	4016a95540	prototype invite app	2017-07-05 16:01:50 +02:00
yflory	bf17ad3f1e	Friend button in the userlist	2017-07-05 15:59:36 +02:00
yflory	d7f9ddd8d2	Fix icon colors in the new menu (/pad app)	2017-07-04 15:57:34 +02:00
yflory	cc67838786	Fix horizontal scrollbar in /pad anonymous mode	2017-07-04 15:56:18 +02:00
ansuz	fa06f9d413	fix minor bugs in poll	2017-07-04 15:09:09 +02:00
ansuz	43d4597f38	merge to master	2017-07-04 14:19:08 +02:00
Caleb James DeLisle	25905d13fa	wip	2017-07-03 20:40:19 +02:00
yflory	47c6c64b8a	Allow emojis in default avatars	2017-07-03 18:37:50 +02:00
yflory	ffd184d50e	Fix overflowing names in the new userlist	2017-07-03 17:41:34 +02:00
yflory	1a27f11e73	Fix dropdown menus in static pages	2017-07-03 17:04:59 +02:00
yflory	fa2d857d70	Fix css issues with Safari	2017-07-03 16:11:41 +02:00
yflory	81c8949aee	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-07-03 14:43:17 +02:00
yflory	1df5e6e855	Fix toolbar buttons for Safari	2017-07-03 14:32:54 +02:00
ansuz	bf414c15ee	fix logout button on home page	2017-07-03 12:26:08 +02:00
yflory	70c9f3df75	Fix avatar size	2017-07-03 12:13:37 +02:00
Caleb James DeLisle	fcff5fa009	wip	2017-07-02 16:51:21 +02:00
yflory	335898a4c7	Hack the drawer to close it when clicking outside	2017-06-30 18:23:23 +02:00
yflory	472a62730b	Fix profile creation and add a link to the profile app	2017-06-30 17:24:22 +02:00
yflory	f357ec32c2	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-30 16:57:37 +02:00
yflory	b153dda6ff	Add avatars in the user list	2017-06-30 16:57:23 +02:00
ansuz	c2e153e8ed	more fouc fixes	2017-06-30 16:20:10 +02:00
ansuz	8ffad5ece6	FOUC fixes	2017-06-30 16:10:42 +02:00
yflory	b6944e6638	Fix userlist style in apps without iframe	2017-06-30 13:13:11 +02:00
yflory	555d0a09f8	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-30 12:36:34 +02:00
yflory	568ce70afd	Add a spinner for the history and update history buttons	2017-06-30 12:36:21 +02:00
Caleb James DeLisle	2144587919	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-30 12:11:55 +02:00
Caleb James DeLisle	c25f2df721	Added caching versions to some of the images which are loaded by js	2017-06-30 12:11:44 +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
ansuz	0b9d7d6c0b	fix color of links in poll and whiteboard	2017-06-29 16:51:44 +02:00
yflory	56a25e1036	Small fixes for the new toolbar	2017-06-29 15:15:40 +02:00
ansuz	c53ebe3598	bring upload status container to the front	2017-06-28 16:33:00 +02:00
ansuz	5e56ad912e	remove the last bit of compiled css	2017-06-28 14:51:49 +02:00
ansuz	7de2683169	make all apps use clientside templates	2017-06-27 18:17:52 +02:00
ansuz	bdca6b10c2	use templates in poll.js	2017-06-27 15:38:12 +02:00
ansuz	3a9b480e4e	resolve merge conflicts in template.js	2017-06-27 14:28:28 +02:00
yflory	40f4fc2682	Add the profile app in template.js	2017-06-27 14:27:54 +02:00
ansuz	9b6790534f	remove grey text from ckeditor initialState	2017-06-27 14:26:09 +02:00
ansuz	e9bfaa9a60	compile less clientside. remove compiled css	2017-06-27 14:25:02 +02:00
yflory	c431041e3f	Fix position of the rightside drawer with small screen	2017-06-26 15:53:29 +02:00
yflory	36ef4178dc	Remove the editable title from the file app	2017-06-26 15:16:17 +02:00
yflory	c364803406	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-26 11:25:06 +02:00
yflory	805e604e53	Add missing icons	2017-06-26 11:24:49 +02:00
ansuz	f181e8db60	correct parentheses	2017-06-26 10:45:27 +02:00
MacLemon	f4fdb7040c	Optimize image assets to speedup page loading	2017-06-25 20:14:23 +02:00
Gustavo H M Silva	6af4335ead	Translated up to page 317 ... Translated up to page 317	2017-06-23 14:28:00 -03:00
yflory	ce44a8d351	Fix the backup button in anonymous drive	2017-06-23 18:02:36 +02:00
yflory	06a0590f73	New folder icons	2017-06-23 17:58:41 +02:00
yflory	0d4d104e08	Mobile support for the new toolbar	2017-06-23 17:56:14 +02:00
yflory	5a48cba999	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-22 16:15:08 +02:00
yflory	684269fdda	Userlist in polls	2017-06-22 16:14:54 +02:00
ansuz	bd1db735dd	jshint compliance	2017-06-22 16:02:20 +02:00
ansuz	35bfa1dce4	test client-side templates in whiteboard app	2017-06-22 16:01:33 +02:00
yflory	a11befaa0f	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-22 15:52:31 +02:00
yflory	13288ee18b	Update the userlist in code, slide and pad	2017-06-22 15:52:25 +02:00
yflory	dcfc59c2e2	Translation key updated	2017-06-22 11:21:37 +02:00
yflory	92b6e60573	Small improvements for the new toolbar	2017-06-22 11:13:53 +02:00
ansuz	eddfb936f2	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-22 11:12:51 +02:00
ansuz	115813c191	Merge branch 'new-templates' into staging	2017-06-22 11:11:32 +02:00
ansuz	3657e978fd	give main2.js a more sensible name	2017-06-22 11:06:11 +02:00
ansuz	e86ef209a8	define loading screen markup in js	2017-06-22 11:04:21 +02:00
ansuz	118b83c420	make register and login user clientside templates	2017-06-22 10:04:46 +02:00
Gogs	6dacbf2bd9	add translations and some improvements	2017-06-21 21:38:56 +02:00
yflory	8d956c3de6	New toolbar	2017-06-21 18:04:35 +02:00
ansuz	48f9745619	clientside templating	2017-06-21 18:02:38 +02:00
yflory	b7a0547b77	New toolbar colors	2017-06-20 17:59:11 +02:00
yflory	59fb5bd8be	One toolbar color per app	2017-06-20 12:33:50 +02:00
yflory	5a248db267	Merge branch 'staging' into newCk	2017-06-20 10:57:40 +02:00
yflory	f13d23241c	Upgrade CkEditor to version 4.7	2017-06-20 10:03:13 +02:00
ansuz	9be23be5eb	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-19 18:09:57 +02:00
ansuz	b80d7513aa	skip over the terms of service link	2017-06-19 18:03:39 +02:00
yflory	1275f3f3a3	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-19 17:59:18 +02:00
yflory	f5da7ae42e	Add a new loading tip in french	2017-06-19 17:59:12 +02:00
ansuz	e2ff88e4c4	tooltips for file upload	2017-06-19 17:56:19 +02:00
Pierre Bondoerffer	726302a9ee	Spanish update	2017-06-19 15:05:17 +02:00
ansuz	3f85471ab3	update footer and package.json for upcoming version	2017-06-15 16:13:33 +02:00
yflory	66b076111e	Add an upload button to the slide's file picker	2017-06-15 12:32:44 +02:00
yflory	a237eec41e	Add a file picker in the slide app	2017-06-15 11:04:58 +02:00
yflory	1077b3b267	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-14 15:55:10 +02:00
yflory	a98353af6c	Add a button to upload a file in the drive	2017-06-14 15:55:03 +02:00
ansuz	9870169e03	remove a few elements from CKEditor config	2017-06-14 15:39:33 +02:00
yflory	2032c08066	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-13 16:15:11 +02:00
yflory	f9c26645cf	Upload images using the slide app	2017-06-13 16:15:04 +02:00
ansuz	ea79294494	Merge pull request #134 from pbondoer/newpoll ... More poll improvements	2017-06-13 14:32:46 +02:00
ansuz	88c2c0afde	Merge pull request #135 from blumeva/staging ... Staging	2017-06-13 14:23:41 +02:00
XWiki SAS	0004be521c	change translation	2017-06-13 14:21:22 +02:00
XWiki SAS	49370764c1	change whiteboard translation	2017-06-12 18:14:33 +02:00
yflory	376b60c21c	New toolbar temp	2017-06-12 15:59:24 +02:00
Pierre Bondoerffer	685b352db8	poll: Add show help button	2017-06-12 14:25:10 +02:00
yflory	8471dab6b1	Provide hints in theme and language dropdowns	2017-06-12 12:47:25 +02:00
Pierre Bondoerffer	621376b0fa	small fixes	2017-06-09 17:44:13 +02:00
Pierre Bondoerffer	cce665a18b	spanish updates	2017-06-09 17:42:25 +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
ansuz	2f851ab97e	fix lint errors	2017-06-07 10:13:51 +02:00