dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,513 Commits 74 Branches 132 Tags 560 MiB
Commit Graph

3513 Commits

Author SHA1 Message Date
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
Caleb James DeLisle 2caaaffc5d Merge branch 'staging' into pad2 2017-08-10 10:11:21 +02:00
Caleb James DeLisle 1043e076a4 Merge branch 'ui-integration' into staging 2017-08-09 17:47:02 +02:00
Caleb James DeLisle c304071492 wip 2017-08-09 17:37:55 +02:00
CatalinScr 41c2f9bd83 Changed the footer, a modified the about page 2017-08-09 18:35:36 +03:00
Caleb James DeLisle e49a42db18 Merge branch 'staging' into pad2 2017-08-09 16:28:51 +02:00
Caleb James DeLisle 1f9bd866c3 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 2017-08-09 16:06:46 +02:00
Pierre Bondoerffer edad5deeac
fix logo not showing sometimes in chrome 2017-08-09 16:06:29 +02:00
Pierre Bondoerffer c036bb26be
use proper bootstrap class 2017-08-09 15:46:17 +02:00
Caleb James DeLisle 52565076b9 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 2017-08-09 14:48:06 +02:00
Caleb James DeLisle 4b25ab80d6 wip 2017-08-09 14:45:39 +02:00
Pierre Bondoerffer b34e252eda
improve whiteboard styles 2017-08-09 14:43:32 +02:00
ansuz 844967a880 continued refactoring 2017-08-09 14:20:37 +02:00
Pierre Bondoerffer 8b2cb37c2f
improve poll looks 2017-08-09 12:33:40 +02:00
Pierre Bondoerffer 280c10c57d
alertify: use the right box-shadow 2017-08-09 11:48:04 +02:00
Pierre Bondoerffer 5821d3e72f
remove useless title 2017-08-09 11:25:58 +02:00
Pierre Bondoerffer 82352b422f
unhide show help button 2017-08-09 11:24:28 +02:00
Pierre Bondoerffer a4aeada585
make the file dialog placeholder visible, center file list 2017-08-09 11:20:46 +02:00
Pierre Bondoerffer d47e26efd5
add margin in code 2017-08-09 11:17:14 +02:00
Pierre Bondoerffer e08ed72653
generate the tooltip after the button 2017-08-09 11:11:53 +02:00
Pierre Bondoerffer 665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended 2017-08-09 11:06:06 +02:00
Pierre Bondoerffer ec011b15d5
remove duplicate css property 2017-08-09 10:55:36 +02:00
Pierre Bondoerffer 34ba673cd3
improve file upload UI 2017-08-09 10:54:20 +02:00
ansuz 34a5a32c44 lint compliance 2017-08-08 20:29:02 +02:00
ansuz cdf3cee9c8 split out message rendering into ui 2017-08-08 18:21:03 +02:00
Pierre Bondoerffer ca686f9c92
(hopefully) fix newline in lists when pasting links 2017-08-08 17:47:10 +02:00
ansuz fcdfa52aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-08 17:13:38 +02:00
ansuz 58b3b32cc3 big messaging refactor. split UI from logic 2017-08-08 17:13:10 +02:00
Pierre Bondoerffer 6ca6755d02
more missing titles in toolbar 2017-08-08 16:51:23 +02:00
Pierre Bondoerffer 2cc6c636db
Add some missing titles 2017-08-08 16:20:31 +02:00
Pierre Bondoerffer d3f2398865
bump tippy to 1.2.0, add dynamicTitle option 2017-08-08 16:19:44 +02:00
ansuz 8301bd44be Merge pull request #164 from pbondoer/staging 
UI improvements
 2017-08-08 14:46:25 +02:00
Pierre Bondoerffer 85e383d5c5
add invisible splitter 2017-08-08 14:36:04 +02:00
Pierre Bondoerffer 355b7f1839
change recent to local pads 2017-08-08 12:05:22 +02:00
Pierre Bondoerffer 90075cd48e
media-tag to less file 2017-08-08 12:01:39 +02:00
Pierre Bondoerffer d15280c6ce
prevent pdfs from being huge 2017-08-08 11:52:16 +02:00
Pierre Bondoerffer c427f375dd
add bootstrap css to /code for image uploader 2017-08-08 11:48:17 +02:00
Pierre Bondoerffer f585ddccdf
fix image sizes in /slide/ 2017-08-08 11:44:01 +02:00
Pierre Bondoerffer 88be5444f0
change alertify warn color 2017-08-08 10:37:37 +02:00
ansuz fc95f1b6a8 lint compliance 2017-08-08 10:32:25 +02:00