ansuz
|
128c9c2f4e
|
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
|
7 years ago |
|
CatalinScr
|
21f1a48380
|
changed the login in button
|
7 years ago |
|
yflory
|
ab3648a30a
|
Merge branch 'newpoll' into staging
|
7 years ago |
|
ansuz
|
351b95d6a9
|
resolve merge conflicts
|
7 years ago |
|
yflory
|
66da349ee4
|
Sandboxed Poll app with less2
|
7 years ago |
|
yflory
|
e02a779c14
|
Use secure drive as default drive
|
7 years ago |
|
yflory
|
b4de31c827
|
Merge branch 'newdrive' into staging
|
7 years ago |
|
ansuz
|
b3e066eaca
|
show loading screen tips during loading screen
|
7 years ago |
|
yflory
|
cdeac00633
|
Merge branch 'staging' into newdrive
|
7 years ago |
|
yflory
|
1d7683503f
|
Fix link origin in sframe upload table
|
7 years ago |
|
yflory
|
92c808812a
|
Fix missing style in toolbar/less2
|
7 years ago |
|
yflory
|
c364377d7c
|
Use less2 in sframe drive
|
7 years ago |
|
yflory
|
dfdeb7b113
|
Fix style and race condition for history mode
|
7 years ago |
|
yflory
|
a810d7bd85
|
Fix style and race condition for history mode
|
7 years ago |
|
yflory
|
456370b1aa
|
Base for Drive in sandboxed iframe
|
7 years ago |
|
ansuz
|
53b98c12c9
|
ignore broken stylesheet
|
7 years ago |
|
yflory
|
88914ec6cc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
8a09e39f46
|
Enable tags in pads
|
7 years ago |
|
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 |
|
ansuz
|
f9d27d2783
|
WIP secure contacts
|
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 |