4068 Commits (5dcfbd07ab17e0d01346828347b608d1a5f1f0d3)
 

Author SHA1 Message Date
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 8 years ago
Caleb James DeLisle c304071492 wip 8 years ago
CatalinScr 41c2f9bd83 Changed the footer, a modified the about page 8 years ago
Caleb James DeLisle e49a42db18 Merge branch 'staging' into pad2 8 years ago
Caleb James DeLisle 1f9bd866c3 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 8 years ago
Pierre Bondoerffer edad5deeac
fix logo not showing sometimes in chrome 8 years ago
Pierre Bondoerffer c036bb26be
use proper bootstrap class 8 years ago
Caleb James DeLisle 52565076b9 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 8 years ago
Caleb James DeLisle 4b25ab80d6 wip 8 years ago
Pierre Bondoerffer b34e252eda
improve whiteboard styles 8 years ago
ansuz 844967a880 continued refactoring 8 years ago
Pierre Bondoerffer 8b2cb37c2f
improve poll looks 8 years ago
Pierre Bondoerffer 280c10c57d
alertify: use the right box-shadow 8 years ago
Pierre Bondoerffer 5821d3e72f
remove useless title 8 years ago
Pierre Bondoerffer 82352b422f
unhide show help button 8 years ago
Pierre Bondoerffer a4aeada585
make the file dialog placeholder visible, center file list 8 years ago
Pierre Bondoerffer d47e26efd5
add margin in code 8 years ago
Pierre Bondoerffer e08ed72653
generate the tooltip after the button 8 years ago
Pierre Bondoerffer 665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended 8 years ago
Pierre Bondoerffer ec011b15d5
remove duplicate css property 8 years ago
Pierre Bondoerffer 34ba673cd3
improve file upload UI 8 years ago
ansuz 34a5a32c44 lint compliance 8 years ago
ansuz cdf3cee9c8 split out message rendering into ui 8 years ago
Pierre Bondoerffer ca686f9c92
(hopefully) fix newline in lists when pasting links 8 years ago
ansuz fcdfa52aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 58b3b32cc3 big messaging refactor. split UI from logic 8 years ago
Pierre Bondoerffer 6ca6755d02
more missing titles in toolbar 8 years ago
Pierre Bondoerffer 2cc6c636db
Add some missing titles 8 years ago
Pierre Bondoerffer d3f2398865
bump tippy to 1.2.0, add dynamicTitle option 8 years ago
ansuz 8301bd44be Merge pull request #164 from pbondoer/staging
UI improvements
8 years ago
Pierre Bondoerffer 85e383d5c5
add invisible splitter 8 years ago
Pierre Bondoerffer 355b7f1839
change recent to local pads 8 years ago
Pierre Bondoerffer 90075cd48e
media-tag to less file 8 years ago