Commit Graph

  • 7a698d092e When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read. Caleb James DeLisle 2017-08-11 17:28:23 +0200
  • 9b86003722 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-11 15:22:43 +0200
  • 66cacf08da allow users to write with tabs instead of spaces ansuz 2017-08-11 15:21:26 +0200
  • f580d9a30a
    *actually* fix alertify on mobile Pierre Bondoerffer 2017-08-11 15:16:51 +0200
  • 8c0fe7d277
    Add missing UI element translations Pierre Bondoerffer 2017-08-11 15:10:45 +0200
  • 144f9f4c83
    alertify fix on mobile Pierre Bondoerffer 2017-08-11 14:46:08 +0200
  • 9833bd7e59 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-11 14:31:40 +0200
  • 89a8e8050c Fix typo and also change message to explain itself better Caleb James DeLisle 2017-08-11 14:31:31 +0200
  • 64849507b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-11 14:26:34 +0200
  • 328107be4d translation key for using tabs ansuz 2017-08-11 14:26:08 +0200
  • b00d37d9e7
    proper namespace for font Pierre Bondoerffer 2017-08-11 14:14:58 +0200
  • 0f74dffc48
    fix register button being cut off Pierre Bondoerffer 2017-08-11 14:11:50 +0200
  • 92d3b1a9fc
    actually pull in open-sans, move fonts to own include Pierre Bondoerffer 2017-08-11 14:10:54 +0200
  • a5f9b49bfb
    make poll box bigger so it show text in smaller windows Pierre Bondoerffer 2017-08-11 13:09:34 +0200
  • 82fadde249
    restyle info-box in drive Pierre Bondoerffer 2017-08-11 13:04:03 +0200
  • 958294f109 put code settings in their own tab ansuz 2017-08-11 13:00:50 +0200
  • c8d7675ede
    remove z-index on splitter in code Pierre Bondoerffer 2017-08-11 12:56:42 +0200
  • 17b986a6ca
    fix toolbar drive link (oops) Pierre Bondoerffer 2017-08-11 12:56:06 +0200
  • ae0b2ca1a8 add label for code indentation ansuz 2017-08-11 12:55:10 +0200
  • 7f2b7fc287 show Your CryptDrive, if logged in. fix typos ansuz 2017-08-11 11:32:21 +0200
  • f4e5e67a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-11 11:00:06 +0200
  • 284124a32d WIP ansuz 2017-08-11 10:59:54 +0200
  • 4acd9957a9 Set the url if there is none Caleb James DeLisle 2017-08-11 10:40:57 +0200
  • 33e73dd5e5 fixed one last fight Caleb James DeLisle 2017-08-10 21:40:34 +0200
  • 9c0b0cc6a8 Merge branch 'staging' into pad2 Caleb James DeLisle 2017-08-10 18:39:16 +0200
  • aa1563a731 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging Caleb James DeLisle 2017-08-10 18:32:27 +0200
  • 1e56fa31c0 yay, they talk and they don't fight Caleb James DeLisle 2017-08-10 18:31:44 +0200
  • 1c526feffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-10 18:06:58 +0200
  • fbb880f277 implement customizable indentation widths ansuz 2017-08-10 18:06:47 +0200
  • e786a66ff3 manual merge Caleb James DeLisle 2017-08-10 15:38:09 +0200
  • ef256e3849
    go to homepage when on infopages Pierre Bondoerffer 2017-08-10 15:17:34 +0200
  • 04b84538e1
    add Open Sans font (with bower) Pierre Bondoerffer 2017-08-10 15:05:57 +0200
  • b3d349bf80 Merge branch 'staging' into pad2 Caleb James DeLisle 2017-08-10 14:53:12 +0200
  • 8efac4e661 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging Caleb James DeLisle 2017-08-10 14:49:41 +0200
  • 0dde1d7507 wip Caleb James DeLisle 2017-08-10 14:49:21 +0200
  • baf64114a6
    point to homepage in drive Pierre Bondoerffer 2017-08-10 14:45:56 +0200
  • 9dce40f3af
    only add the splitter once Pierre Bondoerffer 2017-08-10 14:34:48 +0200
  • 4026994310
    make splitter work when scrolling Pierre Bondoerffer 2017-08-10 14:25:31 +0200
  • 23ce2ed674 Merge pull request #166 from coldfix/master ansuz 2017-08-10 11:43:36 +0200
  • 405526cfa5 Properly escape sed replace expressions Thomas Gläßle 2017-08-10 01:15:10 +0200
  • 2caaaffc5d Merge branch 'staging' into pad2 Caleb James DeLisle 2017-08-10 10:11:21 +0200
  • 1043e076a4 Merge branch 'ui-integration' into staging Caleb James DeLisle 2017-08-09 17:47:02 +0200
  • c304071492 wip Caleb James DeLisle 2017-08-09 17:37:55 +0200
  • 41c2f9bd83 Changed the footer, a modified the about page CatalinScr 2017-08-09 18:35:36 +0300
  • e49a42db18 Merge branch 'staging' into pad2 Caleb James DeLisle 2017-08-09 16:28:51 +0200
  • 1f9bd866c3 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging Caleb James DeLisle 2017-08-09 16:06:46 +0200
  • edad5deeac
    fix logo not showing sometimes in chrome Pierre Bondoerffer 2017-08-09 16:06:29 +0200
  • c036bb26be
    use proper bootstrap class Pierre Bondoerffer 2017-08-09 15:46:17 +0200
  • 52565076b9 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging Caleb James DeLisle 2017-08-09 14:48:06 +0200
  • 4b25ab80d6 wip Caleb James DeLisle 2017-08-09 14:45:39 +0200
  • b34e252eda
    improve whiteboard styles Pierre Bondoerffer 2017-08-09 14:43:32 +0200
  • 844967a880 continued refactoring ansuz 2017-08-09 14:20:37 +0200
  • 8b2cb37c2f
    improve poll looks Pierre Bondoerffer 2017-08-09 12:33:40 +0200
  • 280c10c57d
    alertify: use the right box-shadow Pierre Bondoerffer 2017-08-09 11:48:04 +0200
  • 5821d3e72f
    remove useless title Pierre Bondoerffer 2017-08-09 11:25:58 +0200
  • 82352b422f
    unhide show help button Pierre Bondoerffer 2017-08-09 11:24:28 +0200
  • a4aeada585
    make the file dialog placeholder visible, center file list Pierre Bondoerffer 2017-08-09 11:20:46 +0200
  • d47e26efd5
    add margin in code Pierre Bondoerffer 2017-08-09 11:17:14 +0200
  • e08ed72653
    generate the tooltip after the button Pierre Bondoerffer 2017-08-09 11:11:53 +0200
  • 665e81912e
    put the tooltip on the actual button to prevent tippy from popping when not intended Pierre Bondoerffer 2017-08-09 11:06:06 +0200
  • ec011b15d5
    remove duplicate css property Pierre Bondoerffer 2017-08-09 10:55:36 +0200
  • 34ba673cd3
    improve file upload UI Pierre Bondoerffer 2017-08-09 10:54:20 +0200
  • 34a5a32c44 lint compliance ansuz 2017-08-08 20:29:02 +0200
  • cdf3cee9c8 split out message rendering into ui ansuz 2017-08-08 18:21:03 +0200
  • ca686f9c92
    (hopefully) fix newline in lists when pasting links Pierre Bondoerffer 2017-08-08 17:47:10 +0200
  • fcdfa52aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-08 17:13:38 +0200
  • 58b3b32cc3 big messaging refactor. split UI from logic ansuz 2017-08-08 17:13:10 +0200
  • 6ca6755d02
    more missing titles in toolbar Pierre Bondoerffer 2017-08-08 16:51:23 +0200
  • 2cc6c636db
    Add some missing titles Pierre Bondoerffer 2017-08-08 16:20:31 +0200
  • d3f2398865
    bump tippy to 1.2.0, add dynamicTitle option Pierre Bondoerffer 2017-08-08 16:19:44 +0200
  • 8301bd44be Merge pull request #164 from pbondoer/staging ansuz 2017-08-08 14:46:25 +0200
  • 85e383d5c5
    add invisible splitter Pierre Bondoerffer 2017-08-08 14:36:04 +0200
  • 355b7f1839
    change recent to local pads Pierre Bondoerffer 2017-08-08 12:05:22 +0200
  • 90075cd48e
    media-tag to less file Pierre Bondoerffer 2017-08-08 12:01:39 +0200
  • d15280c6ce
    prevent pdfs from being huge Pierre Bondoerffer 2017-08-08 11:52:16 +0200
  • c427f375dd
    add bootstrap css to /code for image uploader Pierre Bondoerffer 2017-08-08 11:48:17 +0200
  • f585ddccdf
    fix image sizes in /slide/ Pierre Bondoerffer 2017-08-08 11:44:01 +0200
  • 88be5444f0
    change alertify warn color Pierre Bondoerffer 2017-08-08 10:37:37 +0200
  • fc95f1b6a8 lint compliance ansuz 2017-08-08 10:32:25 +0200
  • ba9696ba33 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-08 10:03:54 +0200
  • a612f02be2 Merge branch 'staging' into pad2 Caleb James DeLisle 2017-08-07 17:49:03 +0200
  • c63807fd2b implement channel.send ansuz 2017-08-07 17:24:16 +0200
  • 35a55a15ed wip Caleb James DeLisle 2017-08-07 17:23:28 +0200
  • d835005905 simplify in-memory message format ansuz 2017-08-07 17:22:56 +0200
  • 8f285eba9f
    make file picker ui even prettier Pierre Bondoerffer 2017-08-07 17:22:54 +0200
  • 797cc2b105 handle messages which fail to decrypt ansuz 2017-08-07 17:21:17 +0200
  • 65dfd99171 major wip Caleb James DeLisle 2017-08-07 16:27:57 +0200
  • c53e738054
    improve file picker ui Pierre Bondoerffer 2017-08-07 16:27:29 +0200
  • 798a3dc520
    automatically fill in display name in poll Pierre Bondoerffer 2017-08-07 12:19:21 +0200
  • 0588564bc9
    overflow on poll div Pierre Bondoerffer 2017-08-07 11:49:10 +0200
  • 996c56c242
    fix label in register Pierre Bondoerffer 2017-08-07 11:41:04 +0200
  • 008fa12755
    alertify: add textarea + checkbox Pierre Bondoerffer 2017-08-07 11:26:40 +0200
  • e486e47aa1
    alertify: fix input color + better log styles Pierre Bondoerffer 2017-08-07 11:19:20 +0200
  • 548bce479a Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Caleb James DeLisle 2017-08-07 10:53:27 +0200
  • be29236af1
    fix pdfjs styles Pierre Bondoerffer 2017-08-07 10:47:30 +0200
  • bad5160885 fix bad reference ansuz 2017-08-05 09:14:36 +0200
  • 05aa5ed347 hide new feature until it is finished ansuz 2017-08-04 18:07:47 +0200
  • e333e7903d
    fix styles overlapping Pierre Bondoerffer 2017-08-04 17:44:02 +0200
  • 1db41dd17b
    Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Pierre Bondoerffer 2017-08-04 17:15:55 +0200
  • dac14de18c
    unify fonts Pierre Bondoerffer 2017-08-04 17:15:45 +0200