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
|
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
|
1bf77cb77e
|
changed the icons
|
7 years ago |
|
CatalinScr
|
f95f3f4f24
|
Updated the contact page
|
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 |
|
CatalinScr
|
744fb407ae
|
Updated the what is page
|
7 years ago |
|
ansuz
|
8ee5e14a60
|
merge ui-integration
|
7 years ago |
|
CatalinScr
|
fd3fd945c8
|
Updated the Log in Page
|
7 years ago |
|
CatalinScr
|
1f4d0a0a56
|
Repaired a bug
|
7 years ago |
|
CatalinScr
|
dd48cf7c90
|
updated the register page
|
7 years ago |
|
CatalinScr
|
3196d4558f
|
repaired the responsive error at about page
|
7 years ago |
|
CatalinScr
|
3960cd25f8
|
Updated the about page with the new design
|
7 years ago |
|
Caleb James DeLisle
|
196ce3b3f7
|
Fix alertify style which made the registration popup look bad
|
7 years ago |
|
Pierre Bondoerffer
|
f580d9a30a
|
*actually* fix alertify on mobile
|
7 years ago |
|
Pierre Bondoerffer
|
144f9f4c83
|
alertify fix on mobile
|
7 years ago |
|
Pierre Bondoerffer
|
b00d37d9e7
|
proper namespace for font
|
7 years ago |
|
Pierre Bondoerffer
|
0f74dffc48
|
fix register button being cut off
|
7 years ago |
|
Pierre Bondoerffer
|
92d3b1a9fc
|
actually pull in open-sans, move fonts to own include
|
7 years ago |
|
Pierre Bondoerffer
|
04b84538e1
|
add Open Sans font (with bower)
|
7 years ago |
|
CatalinScr
|
41c2f9bd83
|
Changed the footer, a modified the about page
|
7 years ago |
|
Pierre Bondoerffer
|
280c10c57d
|
alertify: use the right box-shadow
|
7 years ago |
|
Pierre Bondoerffer
|
34ba673cd3
|
improve file upload UI
|
7 years ago |
|
Pierre Bondoerffer
|
90075cd48e
|
media-tag to less file
|
7 years ago |
|
Pierre Bondoerffer
|
88be5444f0
|
change alertify warn color
|
8 years ago |
|
Pierre Bondoerffer
|
c53e738054
|
improve file picker ui
|
8 years ago |
|
Pierre Bondoerffer
|
008fa12755
|
alertify: add textarea + checkbox
|
8 years ago |
|
Pierre Bondoerffer
|
e486e47aa1
|
alertify: fix input color + better log styles
|
8 years ago |
|
Pierre Bondoerffer
|
e333e7903d
|
fix styles overlapping
|
8 years ago |
|
Pierre Bondoerffer
|
1db41dd17b
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
8 years ago |
|
Pierre Bondoerffer
|
dac14de18c
|
unify fonts
|
8 years ago |
|
CatalinScr
|
5afadf10aa
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
8 years ago |
|
CatalinScr
|
3f6b234e97
|
Styled the general menu, footer, updated about
|
8 years ago |
|
Pierre Bondoerffer
|
d3fb6313b6
|
color logo on topbar
|
8 years ago |
|
Pierre Bondoerffer
|
865ba0731c
|
better colors? not sure yet...
|
8 years ago |
|
Pierre Bondoerffer
|
1bd42f0b3e
|
make alertify darker
|
8 years ago |
|
Pierre Bondoerffer
|
ecc766eb7b
|
remove useless margin
|
8 years ago |
|
Pierre Bondoerffer
|
addd91cc72
|
fix styles (again) copyright cjd 2017
|
8 years ago |
|
Pierre Bondoerffer
|
5c21a9048e
|
fix styles
|
8 years ago |
|
Pierre Bondoerffer
|
10e50fc5c7
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
8 years ago |
|
Pierre Bondoerffer
|
6614f3f0e6
|
put the page class on html element
|
8 years ago |
|
CatalinScr
|
043ae4280b
|
repaired the menu
|
8 years ago |
|
CatalinScr
|
250d85bb8a
|
Repaired the menu, clead the code
|
8 years ago |
|
Pierre Bondoerffer
|
4018c7e0a6
|
move alertify stuff
|
8 years ago |
|
CatalinScr
|
e7d09c1ddb
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
|
8 years ago |
|
CatalinScr
|
d4ce7d626c
|
Modified the menu
|
8 years ago |
|
Pierre Bondoerffer
|
f8c7140eec
|
make fonts big
|
8 years ago |
|
Caleb James DeLisle
|
5d70dd93b3
|
Manual merge
|
8 years ago |
|
CatalinScr
|
15fa801bc8
|
work in progress
|
8 years ago |
|
CatalinScr
|
89ab82c0e2
|
Changed the menu, added the logo on top bar
|
8 years ago |
|
Pierre Bondoerffer
|
ae176b0465
|
about page mockup
|
8 years ago |
|
Pierre Bondoerffer
|
304a29e210
|
Improve contact page
|
8 years ago |
|
Pierre Bondoerffer
|
d6679e8ef3
|
Add screenshots to What is CryptPad
|
8 years ago |
|
Pierre Bondoerffer
|
e2f8c9c5da
|
add logo to topbar
|
8 years ago |
|
Pierre Bondoerffer
|
cd0c9cc95a
|
create less templates for info pages
|
8 years ago |
|
Pierre Bondoerffer
|
f71b082aac
|
remove min-height globally, style footer
|
8 years ago |
|
Pierre Bondoerffer
|
0fe49d6641
|
oops, sorry, back to 100% height
|
8 years ago |
|
Pierre Bondoerffer
|
dc0a037894
|
turn login and register into infopages
|
8 years ago |
|
Pierre Bondoerffer
|
549b1b2c4f
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
8 years ago |
|
Pierre Bondoerffer
|
775ea81504
|
start register page
|
8 years ago |
|
CatalinScr
|
69c470330f
|
updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
|
8 years ago |
|
CatalinScr
|
e609950977
|
Changed the favicon, added the boostrap js file, reconfigure the top menu
|
8 years ago |
|
Caleb James DeLisle
|
27aa1886b1
|
Move footer to pages.js and add it to the contact page
|
8 years ago |
|
Caleb James DeLisle
|
490e2b4d0a
|
work in progress on migrating styles back into the infopages.less
|
8 years ago |
|
Caleb James DeLisle
|
cd2b41f51e
|
Fix up some less for supporting the info-pages
|
8 years ago |
|
CatalinScr
|
87dec4a091
|
Changed the font size
|
8 years ago |
|
CatalinScr
|
5921073524
|
Updated the new font, changed the logo, changed see more
|
8 years ago |
|
CatalinScr
|
6862bda454
|
Changed the logo, uploaded the new font, repaired responsive
|
8 years ago |
|
Caleb James DeLisle
|
428bee6306
|
make links clickable and make more link work
|
8 years ago |
|
CatalinScr
|
5fa20836cf
|
Modified Register and login button
|
8 years ago |
|
CatalinScr
|
cab8716519
|
Changed the login button, repaired the hover menu and see more. Updated the logo
|
8 years ago |
|
CatalinScr
|
796bf89491
|
Update of the front-page
|
8 years ago |
|
Caleb James DeLisle
|
49c760131e
|
wip
|
8 years ago |
|
Caleb James DeLisle
|
6a1ec54e2a
|
wip
|
8 years ago |
|
Pierre Bondoerffer
|
dc9565f22f
|
make buttons colorful
|
8 years ago |
|
Caleb James DeLisle
|
8404017af1
|
wip
|
8 years ago |