dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,252 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

62 Commits

Author SHA1 Message Date
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 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
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 86bc14e6bb
new loading screen 2017-08-02 17:19:16 +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 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 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 cd2b41f51e Fix up some less for supporting the info-pages 2017-08-01 11:53:06 +02: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
CatalinScr 6862bda454 Changed the logo, uploaded the new font, repaired responsive 2017-07-31 17:04:37 +03:00
Caleb James DeLisle 428bee6306 make links clickable and make more link work 2017-07-26 15:53:10 +02:00
CatalinScr cab8716519 Changed the login button, repaired the hover menu and see more. Updated the logo 2017-07-25 01:08:53 +03:00
CatalinScr 796bf89491 Update of the front-page 2017-07-24 17:56:54 +03:00
Caleb James DeLisle 49c760131e wip 2017-07-24 14:10:40 +02:00
ansuz dcf5719eaf handle most of the boilerplate stuff 2017-07-23 14:27:47 +02:00
Caleb James DeLisle 6a1ec54e2a wip 2017-07-22 17:31:40 +02:00
Pierre Bondoerffer dc9565f22f
make buttons colorful 2017-07-22 17:30:13 +02:00
Caleb James DeLisle 8404017af1 wip 2017-07-22 16:43:53 +02:00
Caleb James DeLisle ffb5e555a0 Merge branch 'staging' into front-page 2017-07-20 10:09:32 +02:00
ansuz f2320190b8 change friends url to /contacts/ 2017-07-17 17:18:28 +02:00
Caleb James DeLisle f6abdc2b86 manual merge of staging 2017-07-13 10:30:42 +02:00
yflory ac684a8dc7 Use the APP toolbar in profile 2017-07-12 18:34:16 +02:00
yflory 125018c8c3 New settings page 2017-07-10 18:29:23 +02:00
yflory 159d72f33b Merge branch 'msg' into staging 2017-07-10 11:48:22 +02:00
Ecaterina Moraru (Valica) fc065a0484 Issue #151: Spacing between "Log-in" and "Register" buttons 
- Removed ".first" class from Register button
- Increase spacing between buttons
 2017-07-07 17:04:26 +03:00
yflory a5e8f6ae81 Add friend app and fix avatar size 2017-07-06 18:00:03 +02:00
ansuz 4016a95540 prototype invite app 2017-07-05 16:01:50 +02:00
ansuz fa06f9d413 fix minor bugs in poll 2017-07-04 15:09:09 +02:00
Caleb James DeLisle 25905d13fa wip 2017-07-03 20:40:19 +02:00