ansuz
|
570ff75a6c
|
update footer for latest version
|
2017-08-29 11:12:08 +02:00 |
|
ansuz
|
54eefd3d94
|
replace contacts with contacts2
|
2017-08-25 16:07:53 +02:00 |
|
ansuz
|
57d0c6c973
|
Merge branch 'new-messaging' into staging
|
2017-08-25 14:42:34 +02:00 |
|
Caleb James DeLisle
|
35e7341f4d
|
Merge branch 'ui-integration' into staging2
|
2017-08-24 13:54:55 +02:00 |
|
ansuz
|
89a13d4b21
|
work on contacts2 until feature parity is reached
|
2017-08-22 15:55:49 +02:00 |
|
CatalinScr
|
49f7e0d63b
|
Changed the Social Media links to Pierre
|
2017-08-18 16:01:50 +03:00 |
|
CatalinScr
|
744fb407ae
|
Updated the what is page
|
2017-08-16 15:53:10 +03:00 |
|
ansuz
|
46e47b454d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:34:54 +02:00 |
|
Caleb James DeLisle
|
3df20760c4
|
Yann does not have a twitter account.
|
2017-08-16 11:36:14 +02:00 |
|
ansuz
|
8b5519ad29
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:31:09 +02:00 |
|
ansuz
|
2b7dcbe77c
|
remove bs class that caused poor alignment sometimes
|
2017-08-16 11:30:56 +02:00 |
|
Caleb James DeLisle
|
4213d6de70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:29:59 +02:00 |
|
Caleb James DeLisle
|
d6125d864c
|
Added Yann's bio
|
2017-08-16 11:29:50 +02:00 |
|
ansuz
|
7537caf8fe
|
make footer translateable
|
2017-08-16 10:51:08 +02: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
|
3960cd25f8
|
Updated the about page with the new design
|
2017-08-14 16:40:09 +03:00 |
|
ansuz
|
7f2b7fc287
|
show Your CryptDrive, if logged in. fix typos
|
2017-08-11 11:32:21 +02:00 |
|
Pierre Bondoerffer
|
ef256e3849
|
go to homepage when on infopages
|
2017-08-10 15:17:34 +02:00 |
|
Caleb James DeLisle
|
1043e076a4
|
Merge branch 'ui-integration' into staging
|
2017-08-09 17:47:02 +02:00 |
|
CatalinScr
|
41c2f9bd83
|
Changed the footer, a modified the about page
|
2017-08-09 18:35:36 +03:00 |
|
Pierre Bondoerffer
|
c036bb26be
|
use proper bootstrap class
|
2017-08-09 15:46:17 +02:00 |
|
Pierre Bondoerffer
|
b34e252eda
|
improve whiteboard styles
|
2017-08-09 14:43:32 +02:00 |
|
Pierre Bondoerffer
|
8b2cb37c2f
|
improve poll looks
|
2017-08-09 12:33:40 +02:00 |
|
Pierre Bondoerffer
|
82352b422f
|
unhide show help button
|
2017-08-09 11:24:28 +02:00 |
|
Pierre Bondoerffer
|
355b7f1839
|
change recent to local pads
|
2017-08-08 12:05:22 +02:00 |
|
Pierre Bondoerffer
|
996c56c242
|
fix label in register
|
2017-08-07 11:41:04 +02:00 |
|
Pierre Bondoerffer
|
e333e7903d
|
fix styles overlapping
|
2017-08-04 17:44:02 +02:00 |
|
CatalinScr
|
5afadf10aa
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 17:58:48 +03:00 |
|
CatalinScr
|
3f6b234e97
|
Styled the general menu, footer, updated about
|
2017-08-04 17:58:29 +03:00 |
|
Pierre Bondoerffer
|
a16d4be3c4
|
show logged in user
|
2017-08-04 16:48:01 +02:00 |
|
Pierre Bondoerffer
|
7310960f46
|
remove the hack around the hack to fix the hack
|
2017-08-04 15:19:59 +02:00 |
|
Pierre Bondoerffer
|
c953e71a18
|
better class generation and remove duplicate class
|
2017-08-04 15:06:58 +02:00 |
|
Caleb James DeLisle
|
a10214ed2a
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 14:19:54 +02:00 |
|
Caleb James DeLisle
|
75c0876500
|
Added ludovic's bio
|
2017-08-04 14:19:44 +02:00 |
|
CatalinScr
|
250d85bb8a
|
Repaired the menu, clead the code
|
2017-08-04 15:15:35 +03: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
|
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 |
|