 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
|
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
|
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
|
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 |
|
|
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
|
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 |
|