yflory
|
33025a9df9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-22 18:19:06 +02:00 |
|
Caleb James DeLisle
|
d9f5e3638e
|
Big caching improvements :D
|
2017-08-22 15:50:10 +02:00 |
|
yflory
|
1752124071
|
Fix Iframe height in Edge
|
2017-08-22 11:50:52 +02:00 |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
2017-08-21 18:08:37 +02: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
|
f7b2aa85b8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:36:25 +02:00 |
|
Caleb James DeLisle
|
3df20760c4
|
Yann does not have a twitter account.
|
2017-08-16 11:36:14 +02:00 |
|
yflory
|
df8851a53e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:35:56 +02:00 |
|
yflory
|
df0b7155f6
|
Add missing french translation
|
2017-08-16 11:35:40 +02:00 |
|
ansuz
|
127b6dbc6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:34:35 +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 |
|
yflory
|
a39f802b4d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:17:37 +02:00 |
|
yflory
|
e4d842ed08
|
Fix typos in the french translation
|
2017-08-16 10:55:15 +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
|
3196d4558f
|
repaired the responsive error at about page
|
2017-08-15 06:50:13 +03:00 |
|
CatalinScr
|
3960cd25f8
|
Updated the about page with the new design
|
2017-08-14 16:40:09 +03:00 |
|
Caleb James DeLisle
|
7c8df61f91
|
sed majik to switch 'What is CryptDrive' to 'What is CryptPad'
|
2017-08-11 17:54:15 +02:00 |
|
Caleb James DeLisle
|
196ce3b3f7
|
Fix alertify style which made the registration popup look bad
|
2017-08-11 17:49:19 +02:00 |
|
Pierre Bondoerffer
|
f580d9a30a
|
*actually* fix alertify on mobile
|
2017-08-11 15:16:51 +02:00 |
|
Pierre Bondoerffer
|
8c0fe7d277
|
Add missing UI element translations
|
2017-08-11 15:10:45 +02:00 |
|
Pierre Bondoerffer
|
144f9f4c83
|
alertify fix on mobile
|
2017-08-11 14:46:08 +02:00 |
|
Caleb James DeLisle
|
9833bd7e59
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 14:31:40 +02:00 |
|
Caleb James DeLisle
|
89a8e8050c
|
Fix typo and also change message to explain itself better
|
2017-08-11 14:31:31 +02:00 |
|
ansuz
|
64849507b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 14:26:34 +02:00 |
|
ansuz
|
328107be4d
|
translation key for using tabs
|
2017-08-11 14:26:08 +02:00 |
|
Pierre Bondoerffer
|
b00d37d9e7
|
proper namespace for font
|
2017-08-11 14:14:58 +02:00 |
|
Pierre Bondoerffer
|
0f74dffc48
|
fix register button being cut off
|
2017-08-11 14:11:50 +02:00 |
|
Pierre Bondoerffer
|
92d3b1a9fc
|
actually pull in open-sans, move fonts to own include
|
2017-08-11 14:10:54 +02:00 |
|
ansuz
|
958294f109
|
put code settings in their own tab
|
2017-08-11 13:00:50 +02:00 |
|
ansuz
|
ae0b2ca1a8
|
add label for code indentation
|
2017-08-11 12:55:10 +02: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 |
|
Pierre Bondoerffer
|
04b84538e1
|
add Open Sans font (with bower)
|
2017-08-10 15:05:57 +02:00 |
|
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-10 14:49:41 +02:00 |
|
Pierre Bondoerffer
|
baf64114a6
|
point to homepage in drive
|
2017-08-10 14:45:56 +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
|
edad5deeac
|
fix logo not showing sometimes in chrome
|
2017-08-09 16:06:29 +02: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
|
280c10c57d
|
alertify: use the right box-shadow
|
2017-08-09 11:48:04 +02:00 |
|
Pierre Bondoerffer
|
82352b422f
|
unhide show help button
|
2017-08-09 11:24:28 +02:00 |