Commit Graph

4275 Commits (06422e6d5a10ea153b0d848ef68f70c7039b3cfe)
 

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