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 |
|
ansuz
|
9213aa7ee4
|
simplify example config
|
2017-08-16 11:02:03 +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
|
bd45aeaa03
|
bump package.json version
|
2017-08-16 10:31:47 +02:00 |
|
ansuz
|
d3a298d639
|
Merge branch 'ui-integration' into staging
|
2017-08-16 10:20:34 +02:00 |
|
ansuz
|
8ee5e14a60
|
merge ui-integration
|
2017-08-16 10:20:05 +02:00 |
|
Caleb James DeLisle
|
40287f973c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 10:19:50 +02:00 |
|
Caleb James DeLisle
|
b0b1ed037c
|
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
|
2017-08-16 10:19:24 +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 |
|
ansuz
|
9a6bf302b4
|
ignore ckeditor hacks
|
2017-08-14 18:12:05 +02:00 |
|
Caleb James DeLisle
|
638a94785f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-14 16:24:17 +02:00 |
|
Caleb James DeLisle
|
723151254c
|
remove a debug line before release which killed CSP
|
2017-08-14 16:23:56 +02:00 |
|
Caleb James DeLisle
|
7ca60e55a7
|
Lock the pad's inner-iframe down with CSP
|
2017-08-14 16:23:38 +02:00 |
|
CatalinScr
|
3960cd25f8
|
Updated the about page with the new design
|
2017-08-14 16:40:09 +03:00 |
|
ansuz
|
5e6e76dfc1
|
make regex case insensitive
|
2017-08-14 14:41:23 +02:00 |
|
ansuz
|
736288a85b
|
lint compliance
|
2017-08-14 14:02:57 +02:00 |
|
ansuz
|
5037f444e9
|
update markdown sanitization strategy
|
2017-08-14 13:12:43 +02: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 |
|
Caleb James DeLisle
|
878a565f89
|
tiny little performance improvement in something that really doesn't need it
|
2017-08-11 17:34:51 +02:00 |
|
Caleb James DeLisle
|
007db0b080
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 17:28:42 +02:00 |
|
Caleb James DeLisle
|
7a698d092e
|
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
|
2017-08-11 17:28:23 +02:00 |
|
ansuz
|
9b86003722
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 15:22:43 +02:00 |
|
ansuz
|
66cacf08da
|
allow users to write with tabs instead of spaces
|
2017-08-11 15:21:26 +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 |
|
Pierre Bondoerffer
|
a5f9b49bfb
|
make poll box bigger so it show text in smaller windows
|
2017-08-11 13:09:34 +02:00 |
|
Pierre Bondoerffer
|
82fadde249
|
restyle info-box in drive
|
2017-08-11 13:04:03 +02:00 |
|
ansuz
|
958294f109
|
put code settings in their own tab
|
2017-08-11 13:00:50 +02:00 |
|
Pierre Bondoerffer
|
c8d7675ede
|
remove z-index on splitter in code
|
2017-08-11 12:56:42 +02:00 |
|
Pierre Bondoerffer
|
17b986a6ca
|
fix toolbar drive link (oops)
|
2017-08-11 12:56:06 +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 |
|
ansuz
|
f4e5e67a68
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 11:00:06 +02:00 |
|