Commit Graph

5854 Commits (6899c8c4f147546795caa7c4b1fc780cc4e35604)
 

Author SHA1 Message Date
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
Pierre Bondoerffer 6ca6755d02
more missing titles in toolbar
Pierre Bondoerffer 2cc6c636db
Add some missing titles
Pierre Bondoerffer d3f2398865
bump tippy to 1.2.0, add dynamicTitle option
ansuz 8301bd44be Merge pull request from pbondoer/staging
UI improvements
Pierre Bondoerffer 85e383d5c5
add invisible splitter
Pierre Bondoerffer 355b7f1839
change recent to local pads
Pierre Bondoerffer 90075cd48e
media-tag to less file
Pierre Bondoerffer d15280c6ce
prevent pdfs from being huge
Pierre Bondoerffer c427f375dd
add bootstrap css to /code for image uploader
Pierre Bondoerffer f585ddccdf
fix image sizes in /slide/
Pierre Bondoerffer 88be5444f0
change alertify warn color
ansuz fc95f1b6a8 lint compliance
ansuz ba9696ba33 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle a612f02be2 Merge branch 'staging' into pad2
ansuz c63807fd2b implement channel.send
Caleb James DeLisle 35a55a15ed wip
ansuz d835005905 simplify in-memory message format
Pierre Bondoerffer 8f285eba9f
make file picker ui even prettier
ansuz 797cc2b105 handle messages which fail to decrypt
Caleb James DeLisle 65dfd99171 major wip
Pierre Bondoerffer c53e738054
improve file picker ui