1531 Commits

Author SHA1 Message Date
Pierre Bondoerffer
a70c527482
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page 2017-08-04 12:32:26 +02:00
Pierre Bondoerffer
4018c7e0a6
move alertify stuff 2017-08-04 12:31:47 +02:00
Caleb James DeLisle
c274a27dfb Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js 2017-08-04 11:33:28 +02:00
Caleb James DeLisle
0d1f19f5d4 Big manual merge 2017-08-04 11:20:17 +02:00
CatalinScr
e7d09c1ddb Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
2017-08-04 12:16:33 +03:00
CatalinScr
d4ce7d626c Modified the menu 2017-08-04 12:16:13 +03:00
Pierre Bondoerffer
f8c7140eec
make fonts big 2017-08-04 11:10:30 +02:00
Pierre Bondoerffer
f6d45d05f6
use logo in toolbar 2017-08-04 11:01:26 +02:00
Pierre Bondoerffer
1b83e15796
sorry jpg, i forgot you existed 2017-08-04 10:49:18 +02:00
Pierre Bondoerffer
5ce7d64b2c
add pierre photo 2017-08-04 10:30:19 +02:00
Caleb James DeLisle
1b466d250f Add some photos 2017-08-03 18:01:48 +02:00
Caleb James DeLisle
5d70dd93b3 Manual merge 2017-08-03 17:18:03 +02:00
CatalinScr
15fa801bc8 work in progress 2017-08-03 18:09:25 +03:00
Caleb James DeLisle
bc15ce7de5 Manual merge 2017-08-03 17:00:46 +02:00
Caleb James DeLisle
52e9ba92fa Update whitepaper link and also change whatis_zeroknowledge 2017-08-03 16:23:29 +02:00
CatalinScr
89ab82c0e2 Changed the menu, added the logo on top bar 2017-08-03 17:19:55 +03:00
Pierre Bondoerffer
ae176b0465
about page mockup 2017-08-03 15:58:51 +02:00
Pierre Bondoerffer
cdf6345fc1
use sign up 2017-08-02 17:55:05 +02:00
Pierre Bondoerffer
ddc9c4d070
alt favicon pink 2017-08-02 17:52:48 +02:00
ansuz
35867001cb add missing messages 2017-08-02 17:38:34 +02:00
Pierre Bondoerffer
86bc14e6bb
new loading screen 2017-08-02 17:19:16 +02:00
Pierre Bondoerffer
304a29e210
Improve contact page 2017-08-02 16:34:35 +02:00
Pierre Bondoerffer
d6679e8ef3
Add screenshots to What is CryptPad 2017-08-02 15:53:04 +02:00
Pierre Bondoerffer
b3f3f1dabb
Add What is CryptPad keys 2017-08-02 14:57:27 +02:00
Pierre Bondoerffer
e2f8c9c5da
add logo to topbar 2017-08-02 12:37:56 +02:00
Pierre Bondoerffer
8a56029bfe
remove useless images 2017-08-02 11:56:00 +02:00
Pierre Bondoerffer
ea3a8932be
put the content in the right place 2017-08-02 11:50:35 +02:00
Pierre Bondoerffer
262a729ef7
use proper key name 2017-08-02 11:48:30 +02:00
Pierre Bondoerffer
db111257f0
Add translations, remove useless functions 2017-08-02 11:46:55 +02:00
Pierre Bondoerffer
de23195bd8
fix wrong css class 2017-08-02 11:26:02 +02:00
Pierre Bondoerffer
ad4aca4e5f
actually do the changes intended in previous commit 2017-08-02 11:22:52 +02:00
Pierre Bondoerffer
01b2883771
Add headers and footers, generate what-is-cryptpad 2017-08-02 11:20:07 +02:00
Pierre Bondoerffer
cd0c9cc95a
create less templates for info pages 2017-08-02 11:08:36 +02:00
Pierre Bondoerffer
f71b082aac
remove min-height globally, style footer 2017-08-02 11:00:42 +02:00
Pierre Bondoerffer
0fe49d6641
oops, sorry, back to 100% height 2017-08-01 17:26:47 +02:00
Pierre Bondoerffer
dc0a037894
turn login and register into infopages 2017-08-01 17:11:03 +02:00
Pierre Bondoerffer
549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-01 14:35:50 +02:00
Pierre Bondoerffer
775ea81504
start register page 2017-08-01 14:35:45 +02:00
CatalinScr
69c470330f updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
2017-08-01 15:21:07 +03:00
CatalinScr
e609950977 Changed the favicon, added the boostrap js file, reconfigure the top menu 2017-08-01 15:20:29 +03:00
Caleb James DeLisle
27aa1886b1 Move footer to pages.js and add it to the contact page 2017-08-01 14:17:02 +02:00
Caleb James DeLisle
490e2b4d0a work in progress on migrating styles back into the infopages.less 2017-08-01 13:49:42 +02:00
Caleb James DeLisle
cd2b41f51e Fix up some less for supporting the info-pages 2017-08-01 11:53:06 +02:00
Caleb James DeLisle
896186d059 Fix some wrong less files which were breaking the UI of the apps 2017-08-01 11:19:32 +02:00
ansuz
4614d6ae81 remove legacy max-width from usage bar 2017-08-01 10:05:54 +02:00
CatalinScr
87dec4a091 Changed the font size 2017-07-31 19:24:07 +03:00
CatalinScr
5ef0325d90 this are css rules modified -- INSERT -- 2017-07-31 19:14:15 +03:00
CatalinScr
5921073524 Updated the new font, changed the logo, changed see more 2017-07-31 19:13:45 +03:00
Pierre Bondoerffer
ba95931802
Use translation keys 2017-07-31 17:53:31 +02:00
ansuz
9a733cca0e drop support for legacy iframe 2017-07-31 17:30:19 +02:00