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
|
3960cd25f8
|
Updated the about page with the new design
|
7 years ago |
|
ansuz
|
7f2b7fc287
|
show Your CryptDrive, if logged in. fix typos
|
7 years ago |
|
Pierre Bondoerffer
|
ef256e3849
|
go to homepage when on infopages
|
7 years ago |
|
Caleb James DeLisle
|
1043e076a4
|
Merge branch 'ui-integration' into staging
|
7 years ago |
|
CatalinScr
|
41c2f9bd83
|
Changed the footer, a modified the about page
|
7 years ago |
|
Pierre Bondoerffer
|
c036bb26be
|
use proper bootstrap class
|
7 years ago |
|
Pierre Bondoerffer
|
b34e252eda
|
improve whiteboard styles
|
7 years ago |
|
Pierre Bondoerffer
|
8b2cb37c2f
|
improve poll looks
|
7 years ago |
|
Pierre Bondoerffer
|
82352b422f
|
unhide show help button
|
7 years ago |
|
Pierre Bondoerffer
|
355b7f1839
|
change recent to local pads
|
7 years ago |
|
Pierre Bondoerffer
|
996c56c242
|
fix label in register
|
7 years ago |
|
Pierre Bondoerffer
|
e333e7903d
|
fix styles overlapping
|
7 years ago |
|
CatalinScr
|
5afadf10aa
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
CatalinScr
|
3f6b234e97
|
Styled the general menu, footer, updated about
|
7 years ago |
|
Pierre Bondoerffer
|
a16d4be3c4
|
show logged in user
|
7 years ago |
|
Pierre Bondoerffer
|
7310960f46
|
remove the hack around the hack to fix the hack
|
7 years ago |
|
Pierre Bondoerffer
|
c953e71a18
|
better class generation and remove duplicate class
|
7 years ago |
|
Caleb James DeLisle
|
a10214ed2a
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Caleb James DeLisle
|
75c0876500
|
Added ludovic's bio
|
7 years ago |
|
CatalinScr
|
250d85bb8a
|
Repaired the menu, clead the code
|
7 years ago |
|
Caleb James DeLisle
|
c274a27dfb
|
Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
|
7 years ago |
|
Caleb James DeLisle
|
0d1f19f5d4
|
Big manual merge
|
7 years ago |
|
CatalinScr
|
e7d09c1ddb
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
|
7 years ago |
|
CatalinScr
|
d4ce7d626c
|
Modified the menu
|
7 years ago |
|
Pierre Bondoerffer
|
1b83e15796
|
sorry jpg, i forgot you existed
|
7 years ago |
|
Pierre Bondoerffer
|
5ce7d64b2c
|
add pierre photo
|
7 years ago |
|
Caleb James DeLisle
|
1b466d250f
|
Add some photos
|
7 years ago |
|
Caleb James DeLisle
|
5d70dd93b3
|
Manual merge
|
7 years ago |
|
CatalinScr
|
15fa801bc8
|
work in progress
|
7 years ago |
|
CatalinScr
|
89ab82c0e2
|
Changed the menu, added the logo on top bar
|
7 years ago |
|
Pierre Bondoerffer
|
ae176b0465
|
about page mockup
|
7 years ago |
|
Pierre Bondoerffer
|
86bc14e6bb
|
new loading screen
|
7 years ago |
|
Pierre Bondoerffer
|
d6679e8ef3
|
Add screenshots to What is CryptPad
|
7 years ago |
|
Pierre Bondoerffer
|
b3f3f1dabb
|
Add What is CryptPad keys
|
7 years ago |
|
Pierre Bondoerffer
|
e2f8c9c5da
|
add logo to topbar
|
7 years ago |
|
Pierre Bondoerffer
|
ea3a8932be
|
put the content in the right place
|
7 years ago |
|
Pierre Bondoerffer
|
262a729ef7
|
use proper key name
|
7 years ago |
|
Pierre Bondoerffer
|
db111257f0
|
Add translations, remove useless functions
|
7 years ago |
|
Pierre Bondoerffer
|
de23195bd8
|
fix wrong css class
|
7 years ago |
|
Pierre Bondoerffer
|
ad4aca4e5f
|
actually do the changes intended in previous commit
|
7 years ago |
|
Pierre Bondoerffer
|
dc0a037894
|
turn login and register into infopages
|
7 years ago |
|
Pierre Bondoerffer
|
549b1b2c4f
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Pierre Bondoerffer
|
775ea81504
|
start register page
|
7 years ago |
|
CatalinScr
|
69c470330f
|
updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
|
7 years ago |
|
CatalinScr
|
e609950977
|
Changed the favicon, added the boostrap js file, reconfigure the top menu
|
7 years ago |
|
Caleb James DeLisle
|
27aa1886b1
|
Move footer to pages.js and add it to the contact page
|
7 years ago |