infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity
4,451 Commits
1 Branch
3 Tags
274 MiB
Commit Graph

4451 Commits (844d04df87dd408c97b9d4abff73ca56eb895531)

Author SHA1 Message Date
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
ansuz 284124a32d WIP 2017-08-11 10:59:54 +02:00
Caleb James DeLisle 4acd9957a9 Set the url if there is none 2017-08-11 10:40:57 +02:00
Caleb James DeLisle 33e73dd5e5 fixed one last fight 2017-08-10 21:40:34 +02:00
Caleb James DeLisle 9c0b0cc6a8 Merge branch 'staging' into pad2 2017-08-10 18:39:16 +02:00
Caleb James DeLisle aa1563a731 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 2017-08-10 18:32:27 +02:00
Caleb James DeLisle 1e56fa31c0 yay, they talk and they don't fight 2017-08-10 18:31:44 +02:00
ansuz 1c526feffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-10 18:06:58 +02:00
ansuz fbb880f277 implement customizable indentation widths 2017-08-10 18:06:47 +02:00
Caleb James DeLisle e786a66ff3 manual merge 2017-08-10 15:38:09 +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 b3d349bf80 Merge branch 'staging' into pad2 2017-08-10 14:53:12 +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
Caleb James DeLisle 0dde1d7507 wip 2017-08-10 14:49:21 +02:00
Pierre Bondoerffer baf64114a6
point to homepage in drive 2017-08-10 14:45:56 +02:00
Pierre Bondoerffer 9dce40f3af
only add the splitter once 2017-08-10 14:34:48 +02:00
Pierre Bondoerffer 4026994310
make splitter work when scrolling 2017-08-10 14:25:31 +02:00
ansuz 23ce2ed674 Merge pull request #166 from coldfix/master 
Properly escape sed match/replace expressions
 2017-08-10 11:43:36 +02:00
Thomas Gläßle 405526cfa5 Properly escape sed replace expressions 
This fixes an error during container startup due to interpolating a
$STORAGE value that may contain slashes or other "active" characters:

    ...
    Using secure websockets: false
    Using storage adapter: ./storage/file
    sed: bad option in substitution expression

Also add a trailing ',' in the search expression to avoid substituting
in the comment above the actual definition:

    /*  If Cryptpad is proxied without using https, the server needs to know.
     *  Specify 'useSecureWebsockets: true' so that it can send
    ...
 2017-08-10 10:35:38 +02:00
Caleb James DeLisle 2caaaffc5d Merge branch 'staging' into pad2 2017-08-10 10:11:21 +02:00