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 |
|
Pierre Bondoerffer
|
ec011b15d5
|
remove duplicate css property
|
2017-08-09 10:55:36 +02:00 |
|
Pierre Bondoerffer
|
34ba673cd3
|
improve file upload UI
|
2017-08-09 10:54:20 +02:00 |
|
Pierre Bondoerffer
|
ca686f9c92
|
(hopefully) fix newline in lists when pasting links
|
2017-08-08 17:47:10 +02:00 |
|
Pierre Bondoerffer
|
6ca6755d02
|
more missing titles in toolbar
|
2017-08-08 16:51:23 +02:00 |
|
Pierre Bondoerffer
|
2cc6c636db
|
Add some missing titles
|
2017-08-08 16:20:31 +02:00 |
|
Pierre Bondoerffer
|
355b7f1839
|
change recent to local pads
|
2017-08-08 12:05:22 +02:00 |
|
Pierre Bondoerffer
|
90075cd48e
|
media-tag to less file
|
2017-08-08 12:01:39 +02:00 |
|
Pierre Bondoerffer
|
88be5444f0
|
change alertify warn color
|
2017-08-08 10:37:37 +02:00 |
|
Pierre Bondoerffer
|
c53e738054
|
improve file picker ui
|
2017-08-07 16:27:29 +02:00 |
|
Pierre Bondoerffer
|
996c56c242
|
fix label in register
|
2017-08-07 11:41:04 +02:00 |
|
Pierre Bondoerffer
|
008fa12755
|
alertify: add textarea + checkbox
|
2017-08-07 11:26:40 +02:00 |
|
Pierre Bondoerffer
|
e486e47aa1
|
alertify: fix input color + better log styles
|
2017-08-07 11:19:20 +02:00 |
|
Pierre Bondoerffer
|
e333e7903d
|
fix styles overlapping
|
2017-08-04 17:44:02 +02:00 |
|
Pierre Bondoerffer
|
1db41dd17b
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 17:15:55 +02:00 |
|
Pierre Bondoerffer
|
dac14de18c
|
unify fonts
|
2017-08-04 17:15:45 +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
|
8a56adfe53
|
make logos same size, compress
|
2017-08-04 16:25:39 +02:00 |
|
Pierre Bondoerffer
|
d3fb6313b6
|
color logo on topbar
|
2017-08-04 16:22:43 +02:00 |
|
Pierre Bondoerffer
|
865ba0731c
|
better colors? not sure yet...
|
2017-08-04 16:13:27 +02:00 |
|
Pierre Bondoerffer
|
1bd42f0b3e
|
make alertify darker
|
2017-08-04 16:02:35 +02:00 |
|
Caleb James DeLisle
|
0f7124d673
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:26:59 +02:00 |
|
Pierre Bondoerffer
|
ecc766eb7b
|
remove useless margin
|
2017-08-04 15:24:58 +02:00 |
|
Caleb James DeLisle
|
a6547d1ed0
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:20:14 +02:00 |
|
Pierre Bondoerffer
|
7310960f46
|
remove the hack around the hack to fix the hack
|
2017-08-04 15:19:59 +02:00 |
|
Caleb James DeLisle
|
95c7cd3fcc
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:17:22 +02:00 |
|
Pierre Bondoerffer
|
addd91cc72
|
fix styles (again) copyright cjd 2017
|
2017-08-04 15:16:48 +02:00 |
|
Caleb James DeLisle
|
930ba8aec6
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:13:09 +02:00 |
|
Pierre Bondoerffer
|
5c21a9048e
|
fix styles
|
2017-08-04 15:13:03 +02:00 |
|
Caleb James DeLisle
|
b26c62714f
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:08:21 +02:00 |
|
Pierre Bondoerffer
|
c953e71a18
|
better class generation and remove duplicate class
|
2017-08-04 15:06:58 +02:00 |
|
Caleb James DeLisle
|
4d563af045
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 14:51:14 +02:00 |
|
Pierre Bondoerffer
|
10e50fc5c7
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 14:50:44 +02:00 |
|
Pierre Bondoerffer
|
6614f3f0e6
|
put the page class on html element
|
2017-08-04 14:50:35 +02:00 |
|
ansuz
|
96b12d55fb
|
add a return
|
2017-08-04 14:37:21 +02:00 |
|
ansuz
|
b79adf4177
|
redirect to drive if logged in
|
2017-08-04 14:35:47 +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
|
043ae4280b
|
repaired the menu
|
2017-08-04 15:15:47 +03:00 |
|
CatalinScr
|
250d85bb8a
|
Repaired the menu, clead the code
|
2017-08-04 15:15:35 +03:00 |
|
Pierre Bondoerffer
|
e2ad99ab3c
|
change favicon (again)
|
2017-08-04 14:06:10 +02:00 |
|
Pierre Bondoerffer
|
8831f4f91b
|
new favicons
|
2017-08-04 14:02:53 +02:00 |
|
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 |