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 |
|
ansuz
|
c8c44d3bfc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-04 11:22:22 +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 |
|
ansuz
|
11c72499a0
|
don't add duplicate messages to the history
|
2017-08-03 17:06:28 +02: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 |
|
ansuz
|
fb13e656b7
|
get new messages when reconnecting
|
2017-08-03 15:06:06 +02:00 |
|
ansuz
|
52854c5a8e
|
ignore history range responses
|
2017-08-03 15:05:04 +02:00 |
|
ansuz
|
e786117110
|
get new messages when reconnecting and WIP get more history
|
2017-08-03 15:04:29 +02:00 |
|
ansuz
|
2ce341fed6
|
disable input field when disconnected
|
2017-08-03 14:12:07 +02:00 |
|
ansuz
|
aba4e34e7f
|
reuse inline styles as a mixin
|
2017-08-03 12:17:33 +02:00 |
|
ansuz
|
195cb01d72
|
better styles for messaging input
|
2017-08-03 12:15:06 +02:00 |
|
ansuz
|
1fac0b9bc4
|
make todo text bold
|
2017-08-03 11:53:48 +02:00 |
|
ansuz
|
66d81429bd
|
integrate file embed into code editor
|
2017-08-03 11:47:54 +02:00 |
|
ansuz
|
dc7db074e8
|
open pad links when clicking in readOnly mode
|
2017-08-03 11:04:38 +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 |
|
ansuz
|
71d88b156d
|
make empty profiles for users on first visit
|
2017-08-02 17:32:09 +02:00 |
|
Pierre Bondoerffer
|
86bc14e6bb
|
new loading screen
|
2017-08-02 17:19:16 +02:00 |
|
ansuz
|
8b0831ac5d
|
save images drawn with whiteboard to your CryptDrive
|
2017-08-02 16:51:41 +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 |
|
ansuz
|
fe826133b3
|
make some markdown styles reusable
|
2017-08-02 11:03:06 +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 |