546 Commits

Author	SHA1	Message	Date
Caleb James DeLisle	1dabea84d9	Overrides to colortheme.less will nolonger block the adding of new keys to the original file	2017-12-05 18:32:23 +01:00
Caleb James DeLisle	c702a23c77	Initial work on the 'pad will expire' logic	2017-12-05 17:48:30 +01:00
yflory	e164edec03	Fix the webworker app	2017-12-01 18:29:59 +01:00
ansuz	bcdc0d810a	make 404 page translateable, point to home page or drive	2017-12-01 11:51:04 +01:00
ansuz	443eeaa407	fancy 404 page	2017-11-30 19:17:59 +01:00
yflory	acd8ab7446	Add the markdown toolbar in profile	2017-11-27 18:10:37 +01:00
yflory	74e59a513a	Add the markdown toolbar to the slide and poll apps	2017-11-27 17:55:20 +01:00
yflory	b0f553e9ea	Add a markdown toolbar to help with the markdown syntax	2017-11-27 12:17:35 +01:00
yflory	cdd8c6e110	Fix history mode not centered	2017-11-21 17:48:43 +01:00
yflory	06011065d2	Add a debug app	2017-11-21 17:37:38 +01:00
yflory	cf26c4c286	Improve the toolbar UI for smaller screens	2017-11-17 18:21:45 +01:00
yflory	1f53304ad3	Display a dropdown menu inside another one	2017-11-15 15:35:28 +01:00
yflory	014e12b5b5	Ability to update the username from the userlist	2017-11-15 11:32:54 +01:00
yflory	101482b8cc	Migrate settings to use a sandboxed iframe	2017-11-09 14:23:40 +01:00
yflory	e0f7df80b3	Fix avatar upload and use less2 everywhere in profile	2017-10-31 11:11:29 +01:00
yflory	7f9b21405b	Add missing files for profile	2017-10-31 10:27:41 +01:00
yflory	4250688856	Migrate profile to use sframe	2017-10-30 18:49:28 +01:00
yflory	abc511a56e	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-10-30 15:12:29 +01:00
yflory	68accaf653	Todo in sframe with less2	2017-10-30 15:12:15 +01:00
Evilham	735f0a7e30	Merge branch 'theming-improvement' into staging	2017-10-26 20:44:56 +02:00
Evilham	83da9cf752	Moved colours to colortheme.less to enable theming	2017-10-26 20:29:14 +02:00
yflory	6f020b67ca	Add thumbnails to framework apps	2017-10-26 12:31:16 +02:00
Caleb James DeLisle	a149152f11	Merge branch 'staging' into framework	2017-10-18 11:42:31 +03:00
yflory	e553351b79	Put the add friend button in the userlist below the name	2017-10-17 12:39:25 +02:00
Caleb James DeLisle	753e2d797e	Merge branch 'staging' into framework	2017-10-12 17:07:10 +03:00
ansuz	128c9c2f4e	Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin	2017-10-09 17:20:23 +02:00
CatalinScr	21f1a48380	changed the login in button	2017-10-09 17:17:33 +03:00
Caleb James DeLisle	f0eb58ee95	Merge branch 'staging' into framework	2017-10-06 14:50:35 +03:00
yflory	ab3648a30a	Merge branch 'newpoll' into staging	2017-10-05 17:56:17 +02:00
Caleb James DeLisle	d9e97b86e6	Merge branch 'staging' into framework	2017-10-05 12:14:37 +03:00
Caleb James DeLisle	383c2f54cb	1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.	2017-10-05 12:14:03 +03:00
ansuz	351b95d6a9	resolve merge conflicts	2017-10-02 18:59:47 +02:00
yflory	66da349ee4	Sandboxed Poll app with less2	2017-09-27 18:52:04 +02:00
yflory	e02a779c14	Use secure drive as default drive	2017-09-27 10:31:35 +02:00
yflory	b4de31c827	Merge branch 'newdrive' into staging	2017-09-27 10:28:16 +02:00
ansuz	b3e066eaca	show loading screen tips during loading screen	2017-09-26 10:59:25 +02:00
yflory	cdeac00633	Merge branch 'staging' into newdrive	2017-09-25 17:35:06 +02:00
yflory	1d7683503f	Fix link origin in sframe upload table	2017-09-25 12:44:05 +02:00
yflory	92c808812a	Fix missing style in toolbar/less2	2017-09-25 11:59:05 +02:00
yflory	c364377d7c	Use less2 in sframe drive	2017-09-25 11:48:42 +02:00
yflory	dfdeb7b113	Fix style and race condition for history mode	2017-09-21 18:00:33 +02:00
yflory	a810d7bd85	Fix style and race condition for history mode	2017-09-21 18:00:11 +02:00
yflory	456370b1aa	Base for Drive in sandboxed iframe	2017-09-21 17:59:26 +02:00
ansuz	53b98c12c9	ignore broken stylesheet	2017-09-20 11:33:30 +02:00
yflory	88914ec6cc	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-09-19 15:36:38 +02:00
yflory	8a09e39f46	Enable tags in pads	2017-09-19 15:30:08 +02:00
ansuz	d2b27f3588	resolve merge conflicts	2017-09-19 14:24:26 +02:00
ansuz	f127240a2f	add poll to main.less	2017-09-19 14:23:54 +02:00
yflory	6683434c62	Fix wrong relative url	2017-09-19 12:03:45 +02:00
yflory	732585ea7b	Sandboxed iframe for the whiteboard app	2017-09-19 10:27:31 +02:00
ansuz	f9d27d2783	WIP secure contacts	2017-09-18 15:09:01 +02:00
Caleb James DeLisle	b24e9b84af	Manual merge, update the CSS in loading.js and document that loading.less does nothing.	2017-09-14 10:48:35 +02:00
ansuz	2797a77f5d	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-09-13 18:18:45 +02:00
ansuz	f039fc7ff5	develop a system for avoiding z-index problems	2017-09-13 17:43:17 +02:00
yflory	d360e2d0f4	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-09-13 16:20:26 +02:00
yflory	ab64bf9e59	Use less2 for the loading screen	2017-09-13 16:19:26 +02:00
ansuz	244e3ecba7	support forefront flag in alert config	2017-09-13 12:32:30 +02:00
yflory	437f50fd4a	Migrate the file to a sandboxed iframe	2017-09-12 18:40:11 +02:00
yflory	5cde3fffb8	Align title for normal, readonly and page mode in the toolbar	2017-09-11 12:04:22 +02:00
yflory	7582c9cffd	Fix register button in the index dropdown menu for mobiles	2017-09-11 11:22:41 +02:00
yflory	c3a07e879c	Merge branch 'staging' into slide2	2017-09-08 16:23:07 +02:00
yflory	f2aaaa9751	Move slide to secure iframe	2017-09-07 18:56:58 +02:00
ansuz	809b56625d	refactor ui elements	2017-09-07 18:54:58 +02:00
ansuz	ef30b0bc42	contribute to z-index arms race	2017-09-07 16:50:06 +02:00
ansuz	263c2eb2c2	fix overflowing title text	2017-09-07 14:17:43 +02:00
ansuz	15e24ebe4f	ui for hashtag picker	2017-09-07 12:45:07 +02:00
yflory	204e45dfae	Enable templates in pad	2017-09-05 11:57:44 +02:00
yflory	78b338c379	Merge branch 'code2' into staging	2017-09-05 11:38:17 +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
ansuz	7b27b8635d	fix padding on registration button	2017-08-31 18:58:08 +02:00
CatalinScr	0ceb4cbbcb	Updated the contact page with the new design	2017-08-31 16:26:20 +03:00
CatalinScr	83be769bb3	Merge branch 'master' into staging ... updated with new version	2017-08-31 11:36:39 +03:00
CatalinScr	1bf77cb77e	changed the icons	2017-08-31 11:27:02 +03:00
CatalinScr	f95f3f4f24	Updated the contact page	2017-08-31 10:04:40 +03:00
yflory	0893bcc0e5	Merge branch 'staging' into code2	2017-08-30 14:57:19 +02:00
yflory	7498057c89	Fix Safari iframe size	2017-08-30 11:11:43 +02:00
yflory	a2ed266048	Move the code app in a secure iframe	2017-08-30 11:10:57 +02:00
yflory	6c65e5ff72	Fix the ghost icon in the drive and add missing text	2017-08-28 12:22:31 +02:00
Caleb James DeLisle	35e7341f4d	Merge branch 'ui-integration' into staging2	2017-08-24 13:54:55 +02:00
Caleb James DeLisle	2ad9fcee17	Manual merge of notify.js	2017-08-23 10:45:55 +02:00
yflory	1752124071	Fix Iframe height in Edge	2017-08-22 11:50:52 +02:00
Caleb James DeLisle	b081603455	Update requirejs	2017-08-21 18:08:37 +02:00
yflory	0a813b4fab	Fix limit bar overflowing when over the limit	2017-08-17 10:24:10 +02:00
CatalinScr	744fb407ae	Updated the what is page	2017-08-16 15:53:10 +03:00
ansuz	8ee5e14a60	merge ui-integration	2017-08-16 10:20:05 +02:00
CatalinScr	fd3fd945c8	Updated the Log in Page	2017-08-16 07:56:18 +03:00
CatalinScr	1f4d0a0a56	Repaired a bug	2017-08-16 06:56:08 +03:00
CatalinScr	dd48cf7c90	updated the register page	2017-08-15 23:47:36 +03:00
CatalinScr	3196d4558f	repaired the responsive error at about page	2017-08-15 06:50:13 +03:00
CatalinScr	3960cd25f8	Updated the about page with the new design	2017-08-14 16:40:09 +03:00
Caleb James DeLisle	196ce3b3f7	Fix alertify style which made the registration popup look bad	2017-08-11 17:49:19 +02:00
Pierre Bondoerffer	f580d9a30a	*actually* fix alertify on mobile	2017-08-11 15:16:51 +02:00
Pierre Bondoerffer	144f9f4c83	alertify fix on mobile	2017-08-11 14:46: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
Pierre Bondoerffer	04b84538e1	add Open Sans font (with bower)	2017-08-10 15:05:57 +02:00
CatalinScr	41c2f9bd83	Changed the footer, a modified the about page	2017-08-09 18:35:36 +03:00
Pierre Bondoerffer	280c10c57d	alertify: use the right box-shadow	2017-08-09 11:48:04 +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	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	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	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
Pierre Bondoerffer	ecc766eb7b	remove useless margin	2017-08-04 15:24:58 +02:00
Pierre Bondoerffer	addd91cc72	fix styles (again) copyright cjd 2017	2017-08-04 15:16:48 +02:00
Pierre Bondoerffer	5c21a9048e	fix styles	2017-08-04 15:13:03 +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
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	4018c7e0a6	move alertify stuff	2017-08-04 12:31:47 +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
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
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	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	e2f8c9c5da	add logo to topbar	2017-08-02 12:37:56 +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