This website works better with JavaScript.
5afadf10aa
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
CatalinScr
2017-08-04 17:58:48 +0300
3f6b234e97
Styled the general menu, footer, updated about
CatalinScr
2017-08-04 17:58:29 +0300
a16d4be3c4
show logged in user
Pierre Bondoerffer
2017-08-04 16:48:01 +0200
8a56adfe53
make logos same size, compress
Pierre Bondoerffer
2017-08-04 16:25:39 +0200
d3fb6313b6
color logo on topbar
Pierre Bondoerffer
2017-08-04 16:22:43 +0200
865ba0731c
better colors? not sure yet...
Pierre Bondoerffer
2017-08-04 16:13:27 +0200
1bd42f0b3e
make alertify darker
Pierre Bondoerffer
2017-08-04 16:02:35 +0200
244f436f6e
resolve merge conflict
ansuz
2017-08-04 16:01:20 +0200
2a8311396e
lint compliance
ansuz
2017-08-04 16:00:06 +0200
395f6e1b27
reset confirm text for alertify
ansuz
2017-08-04 15:54:15 +0200
eaf5c73b05
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into front-page
Caleb James DeLisle
2017-08-04 15:47:34 +0200
dd6a057962
add 'msg' class for pierre
ansuz
2017-08-04 15:45:30 +0200
0f7124d673
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Caleb James DeLisle
2017-08-04 15:26:59 +0200
ecc766eb7b
remove useless margin
Pierre Bondoerffer
2017-08-04 15:24:58 +0200
a6547d1ed0
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Caleb James DeLisle
2017-08-04 15:20:14 +0200
7310960f46
remove the hack around the hack to fix the hack
Pierre Bondoerffer
2017-08-04 15:19:59 +0200
95c7cd3fcc
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Caleb James DeLisle
2017-08-04 15:17:22 +0200
addd91cc72
fix styles (again) copyright cjd 2017
Pierre Bondoerffer
2017-08-04 15:16:48 +0200
930ba8aec6
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Caleb James DeLisle
2017-08-04 15:13:09 +0200
5c21a9048e
fix styles
Pierre Bondoerffer
2017-08-04 15:13:03 +0200
b26c62714f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Caleb James DeLisle
2017-08-04 15:08:21 +0200
c953e71a18
better class generation and remove duplicate class
Pierre Bondoerffer
2017-08-04 15:06:58 +0200
4d563af045
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Caleb James DeLisle
2017-08-04 14:51:14 +0200
10e50fc5c7
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer
2017-08-04 14:50:44 +0200
6614f3f0e6
put the page class on html element
Pierre Bondoerffer
2017-08-04 14:50:35 +0200
96b12d55fb
add a return
ansuz
2017-08-04 14:37:21 +0200
b79adf4177
redirect to drive if logged in
ansuz
2017-08-04 14:35:47 +0200
c895d06193
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz
2017-08-04 14:26:31 +0200
252f40748a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz
2017-08-04 14:21:26 +0200
a10214ed2a
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Caleb James DeLisle
2017-08-04 14:19:54 +0200
75c0876500
Added ludovic's bio
Caleb James DeLisle
2017-08-04 14:19:44 +0200
043ae4280b
repaired the menu
CatalinScr
2017-08-04 15:15:47 +0300
250d85bb8a
Repaired the menu, clead the code
CatalinScr
2017-08-04 15:15:35 +0300
e2ad99ab3c
change favicon (again)
Pierre Bondoerffer
2017-08-04 14:06:10 +0200
9865359bb0
don't tell users about new versions
ansuz
2017-08-04 14:05:00 +0200
8831f4f91b
new favicons
Pierre Bondoerffer
2017-08-04 14:02:53 +0200
a70c527482
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer
2017-08-04 12:32:26 +0200
4018c7e0a6
move alertify stuff
Pierre Bondoerffer
2017-08-04 12:31:47 +0200
c274a27dfb
Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
Caleb James DeLisle
2017-08-04 11:33:28 +0200
c8c44d3bfc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz
2017-08-04 11:22:22 +0200
0d1f19f5d4
Big manual merge
Caleb James DeLisle
2017-08-04 11:20:17 +0200
e7d09c1ddb
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page changed the menu
CatalinScr
2017-08-04 12:16:33 +0300
d4ce7d626c
Modified the menu
CatalinScr
2017-08-04 12:16:13 +0300
f8c7140eec
make fonts big
Pierre Bondoerffer
2017-08-04 11:10:30 +0200
f6d45d05f6
use logo in toolbar
Pierre Bondoerffer
2017-08-04 11:01:26 +0200
1b83e15796
sorry jpg, i forgot you existed
Pierre Bondoerffer
2017-08-04 10:49:18 +0200
5ce7d64b2c
add pierre photo
Pierre Bondoerffer
2017-08-04 10:30:19 +0200
1b466d250f
Add some photos
Caleb James DeLisle
2017-08-03 18:01:48 +0200
5d70dd93b3
Manual merge
Caleb James DeLisle
2017-08-03 17:18:03 +0200
15fa801bc8
work in progress
CatalinScr
2017-08-03 18:09:25 +0300
11c72499a0
don't add duplicate messages to the history
ansuz
2017-08-03 17:06:28 +0200
bc15ce7de5
Manual merge
Caleb James DeLisle
2017-08-03 17:00:46 +0200
52e9ba92fa
Update whitepaper link and also change whatis_zeroknowledge
Caleb James DeLisle
2017-08-03 16:23:29 +0200
89ab82c0e2
Changed the menu, added the logo on top bar
CatalinScr
2017-08-03 17:19:55 +0300
ae176b0465
about page mockup
Pierre Bondoerffer
2017-08-03 15:58:51 +0200
fb13e656b7
get new messages when reconnecting
ansuz
2017-08-03 15:06:06 +0200
52854c5a8e
ignore history range responses
ansuz
2017-08-03 15:05:04 +0200
e786117110
get new messages when reconnecting and WIP get more history
ansuz
2017-08-03 15:04:29 +0200
2ce341fed6
disable input field when disconnected
ansuz
2017-08-03 14:12:07 +0200
aba4e34e7f
reuse inline styles as a mixin
ansuz
2017-08-03 12:17:33 +0200
195cb01d72
better styles for messaging input
ansuz
2017-08-03 12:15:06 +0200
1fac0b9bc4
make todo text bold
ansuz
2017-08-03 11:53:48 +0200
66d81429bd
integrate file embed into code editor
ansuz
2017-08-03 11:47:54 +0200
dc7db074e8
open pad links when clicking in readOnly mode
ansuz
2017-08-03 11:04:38 +0200
cdf6345fc1
use sign up
Pierre Bondoerffer
2017-08-02 17:55:05 +0200
ddc9c4d070
alt favicon pink
Pierre Bondoerffer
2017-08-02 17:52:48 +0200
35867001cb
add missing messages
ansuz
2017-08-02 17:38:34 +0200
71d88b156d
make empty profiles for users on first visit
ansuz
2017-08-02 17:32:09 +0200
86bc14e6bb
new loading screen
Pierre Bondoerffer
2017-08-02 17:19:16 +0200
8b0831ac5d
save images drawn with whiteboard to your CryptDrive
ansuz
2017-08-02 16:51:41 +0200
304a29e210
Improve contact page
Pierre Bondoerffer
2017-08-02 16:34:35 +0200
d6679e8ef3
Add screenshots to What is CryptPad
Pierre Bondoerffer
2017-08-02 15:53:04 +0200
b3f3f1dabb
Add What is CryptPad keys
Pierre Bondoerffer
2017-08-02 14:57:27 +0200
e2f8c9c5da
add logo to topbar
Pierre Bondoerffer
2017-08-02 12:37:56 +0200
8a56029bfe
remove useless images
Pierre Bondoerffer
2017-08-02 11:56:00 +0200
ea3a8932be
put the content in the right place
Pierre Bondoerffer
2017-08-02 11:50:35 +0200
262a729ef7
use proper key name
Pierre Bondoerffer
2017-08-02 11:48:30 +0200
db111257f0
Add translations, remove useless functions
Pierre Bondoerffer
2017-08-02 11:46:55 +0200
de23195bd8
fix wrong css class
Pierre Bondoerffer
2017-08-02 11:26:02 +0200
ad4aca4e5f
actually do the changes intended in previous commit
Pierre Bondoerffer
2017-08-02 11:22:52 +0200
01b2883771
Add headers and footers, generate what-is-cryptpad
Pierre Bondoerffer
2017-08-02 11:20:07 +0200
cd0c9cc95a
create less templates for info pages
Pierre Bondoerffer
2017-08-02 11:08:36 +0200
fe826133b3
make some markdown styles reusable
ansuz
2017-08-02 11:03:06 +0200
f71b082aac
remove min-height globally, style footer
Pierre Bondoerffer
2017-08-02 11:00:42 +0200
0fe49d6641
oops, sorry, back to 100% height
Pierre Bondoerffer
2017-08-01 17:26:47 +0200
dc0a037894
turn login and register into infopages
Pierre Bondoerffer
2017-08-01 17:11:03 +0200
549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer
2017-08-01 14:35:50 +0200
775ea81504
start register page
Pierre Bondoerffer
2017-08-01 14:35:45 +0200
69c470330f
updated the favicons, changed the menu
CatalinScr
2017-08-01 15:21:07 +0300
e609950977
Changed the favicon, added the boostrap js file, reconfigure the top menu
CatalinScr
2017-08-01 15:20:29 +0300
27aa1886b1
Move footer to pages.js and add it to the contact page
Caleb James DeLisle
2017-08-01 14:17:02 +0200
0602fabc41
Merge branch 'soon' into staging
ansuz
2017-08-01 13:54:10 +0200
d84487ab49
Merge branch 'master' into staging
ansuz
2017-08-01 13:54:04 +0200
490e2b4d0a
work in progress on migrating styles back into the infopages.less
Caleb James DeLisle
2017-08-01 13:49:42 +0200
cd2b41f51e
Fix up some less for supporting the info-pages
Caleb James DeLisle
2017-08-01 11:53:06 +0200
ace31c952e
clear tooltips when redrawing the userlist
ansuz
2017-08-01 11:50:43 +0200
24436c2c51
clear tooltips when redrawing the userlist
ansuz
2017-08-01 11:50:43 +0200
35cf23ce2c
clear tooltips when redrawing the userlist
ansuz
2017-08-01 11:50:43 +0200
896186d059
Fix some wrong less files which were breaking the UI of the apps
Caleb James DeLisle
2017-08-01 11:19:32 +0200
4c6f8d71e1
don't invoke spinner if it does not exist
ansuz
2017-08-01 11:08:25 +0200