12676 Commits (ff779f6767de83e42ed6659fcabf7e4b5ab57588)
 

Author SHA1 Message Date
Pierre Bondoerffer c8d7675ede
remove z-index on splitter in code 7 years ago
Pierre Bondoerffer 17b986a6ca
fix toolbar drive link (oops) 7 years ago
ansuz ae0b2ca1a8 add label for code indentation 7 years ago
ansuz 7f2b7fc287 show Your CryptDrive, if logged in. fix typos 7 years ago
ansuz f4e5e67a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 284124a32d WIP 7 years ago
Caleb James DeLisle 4acd9957a9 Set the url if there is none 7 years ago
Caleb James DeLisle 33e73dd5e5 fixed one last fight 7 years ago
Caleb James DeLisle 9c0b0cc6a8 Merge branch 'staging' into pad2 7 years ago
Caleb James DeLisle aa1563a731 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Caleb James DeLisle 1e56fa31c0 yay, they talk and they don't fight 7 years ago
ansuz 1c526feffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz fbb880f277 implement customizable indentation widths 7 years ago
Caleb James DeLisle e786a66ff3 manual merge 7 years ago
Pierre Bondoerffer ef256e3849
go to homepage when on infopages 7 years ago
Pierre Bondoerffer 04b84538e1
add Open Sans font (with bower) 7 years ago
Caleb James DeLisle b3d349bf80 Merge branch 'staging' into pad2 7 years ago
Caleb James DeLisle 8efac4e661 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Caleb James DeLisle 0dde1d7507 wip 7 years ago
Pierre Bondoerffer baf64114a6
point to homepage in drive 7 years ago
Pierre Bondoerffer 9dce40f3af
only add the splitter once 7 years ago
Pierre Bondoerffer 4026994310
make splitter work when scrolling 7 years ago
ansuz 23ce2ed674 Merge pull request #166 from coldfix/master
Properly escape sed match/replace expressions
7 years ago
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
    ...
7 years ago
Caleb James DeLisle 2caaaffc5d Merge branch 'staging' into pad2 7 years ago
Caleb James DeLisle 1043e076a4 Merge branch 'ui-integration' into staging 7 years ago
Caleb James DeLisle c304071492 wip 7 years ago
CatalinScr 41c2f9bd83 Changed the footer, a modified the about page 7 years ago
Caleb James DeLisle e49a42db18 Merge branch 'staging' into pad2 7 years ago
Caleb James DeLisle 1f9bd866c3 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Pierre Bondoerffer edad5deeac
fix logo not showing sometimes in chrome 7 years ago
Pierre Bondoerffer c036bb26be
use proper bootstrap class 7 years ago
Caleb James DeLisle 52565076b9 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Caleb James DeLisle 4b25ab80d6 wip 7 years ago
Pierre Bondoerffer b34e252eda
improve whiteboard styles 7 years ago
ansuz 844967a880 continued refactoring 7 years ago
Pierre Bondoerffer 8b2cb37c2f
improve poll looks 7 years ago
Pierre Bondoerffer 280c10c57d
alertify: use the right box-shadow 7 years ago
Pierre Bondoerffer 5821d3e72f
remove useless title 7 years ago
Pierre Bondoerffer 82352b422f
unhide show help button 7 years ago
Pierre Bondoerffer a4aeada585
make the file dialog placeholder visible, center file list 7 years ago
Pierre Bondoerffer d47e26efd5
add margin in code 7 years ago
Pierre Bondoerffer e08ed72653
generate the tooltip after the button 7 years ago
Pierre Bondoerffer 665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended 7 years ago
Pierre Bondoerffer ec011b15d5
remove duplicate css property 7 years ago
Pierre Bondoerffer 34ba673cd3
improve file upload UI 7 years ago
ansuz 34a5a32c44 lint compliance 7 years ago
ansuz cdf3cee9c8 split out message rendering into ui 7 years ago
Pierre Bondoerffer ca686f9c92
(hopefully) fix newline in lists when pasting links 7 years ago
ansuz fcdfa52aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago