ansuz
|
d2b27f3588
|
resolve merge conflicts
|
7 years ago |
|
ansuz
|
f127240a2f
|
add poll to main.less
|
7 years ago |
|
yflory
|
6683434c62
|
Fix wrong relative url
|
7 years ago |
|
yflory
|
732585ea7b
|
Sandboxed iframe for the whiteboard app
|
7 years ago |
|
Caleb James DeLisle
|
b24e9b84af
|
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
|
7 years ago |
|
ansuz
|
2797a77f5d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
f039fc7ff5
|
develop a system for avoiding z-index problems
|
7 years ago |
|
yflory
|
d360e2d0f4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
ab64bf9e59
|
Use less2 for the loading screen
|
7 years ago |
|
ansuz
|
244e3ecba7
|
support forefront flag in alert config
|
7 years ago |
|
yflory
|
437f50fd4a
|
Migrate the file to a sandboxed iframe
|
7 years ago |
|
yflory
|
5cde3fffb8
|
Align title for normal, readonly and page mode in the toolbar
|
7 years ago |
|
yflory
|
7582c9cffd
|
Fix register button in the index dropdown menu for mobiles
|
7 years ago |
|
yflory
|
c3a07e879c
|
Merge branch 'staging' into slide2
|
7 years ago |
|
yflory
|
f2aaaa9751
|
Move slide to secure iframe
|
7 years ago |
|
ansuz
|
809b56625d
|
refactor ui elements
|
7 years ago |
|
ansuz
|
ef30b0bc42
|
contribute to z-index arms race
|
7 years ago |
|
ansuz
|
263c2eb2c2
|
fix overflowing title text
|
7 years ago |
|
ansuz
|
15e24ebe4f
|
ui for hashtag picker
|
7 years ago |
|
yflory
|
204e45dfae
|
Enable templates in pad
|
7 years ago |
|
yflory
|
78b338c379
|
Merge branch 'code2' into staging
|
7 years ago |
|
yflory
|
d2787e3eff
|
Make code2 the default code app
|
7 years ago |
|
yflory
|
86e23ac19f
|
Use less2 in secure iframes
|
7 years ago |
|
ansuz
|
7b27b8635d
|
fix padding on registration button
|
7 years ago |
|
CatalinScr
|
0ceb4cbbcb
|
Updated the contact page with the new design
|
7 years ago |
|
CatalinScr
|
83be769bb3
|
Merge branch 'master' into staging
updated with new version
|
7 years ago |
|
CatalinScr
|
1bf77cb77e
|
changed the icons
|
7 years ago |
|
CatalinScr
|
f95f3f4f24
|
Updated the contact page
|
7 years ago |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
7 years ago |
|
yflory
|
7498057c89
|
Fix Safari iframe size
|
7 years ago |
|
yflory
|
a2ed266048
|
Move the code app in a secure iframe
|
7 years ago |
|
yflory
|
6c65e5ff72
|
Fix the ghost icon in the drive and add missing text
|
7 years ago |
|
Caleb James DeLisle
|
35e7341f4d
|
Merge branch 'ui-integration' into staging2
|
7 years ago |
|
Caleb James DeLisle
|
2ad9fcee17
|
Manual merge of notify.js
|
7 years ago |
|
yflory
|
1752124071
|
Fix Iframe height in Edge
|
7 years ago |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
7 years ago |
|
yflory
|
0a813b4fab
|
Fix limit bar overflowing when over the limit
|
8 years ago |
|
CatalinScr
|
744fb407ae
|
Updated the what is page
|
8 years ago |
|
ansuz
|
8ee5e14a60
|
merge ui-integration
|
8 years ago |
|
CatalinScr
|
fd3fd945c8
|
Updated the Log in Page
|
8 years ago |
|
CatalinScr
|
1f4d0a0a56
|
Repaired a bug
|
8 years ago |
|
CatalinScr
|
dd48cf7c90
|
updated the register page
|
8 years ago |
|
CatalinScr
|
3196d4558f
|
repaired the responsive error at about page
|
8 years ago |
|
CatalinScr
|
3960cd25f8
|
Updated the about page with the new design
|
8 years ago |
|
Caleb James DeLisle
|
196ce3b3f7
|
Fix alertify style which made the registration popup look bad
|
8 years ago |
|
Pierre Bondoerffer
|
f580d9a30a
|
*actually* fix alertify on mobile
|
8 years ago |
|
Pierre Bondoerffer
|
144f9f4c83
|
alertify fix on mobile
|
8 years ago |
|
Pierre Bondoerffer
|
b00d37d9e7
|
proper namespace for font
|
8 years ago |
|
Pierre Bondoerffer
|
0f74dffc48
|
fix register button being cut off
|
8 years ago |
|
Pierre Bondoerffer
|
92d3b1a9fc
|
actually pull in open-sans, move fonts to own include
|
8 years ago |