442 Commits

Author SHA1 Message Date
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