web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 2874ccb5dc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-16 12:15:20 +02:00
  • 2a8abc2699 comment out splitter code ansuz 2017-08-16 12:15:08 +02:00
  • e6cdf955d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-16 12:11:46 +02:00
  • 725e19925c Yeah, that was silly... Caleb James DeLisle 2017-08-16 12:11:25 +02:00
  • 46e47b454d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-16 11:34:54 +02:00
  • f7b2aa85b8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-16 11:36:25 +02:00
  • 3df20760c4 Yann does not have a twitter account. Caleb James DeLisle 2017-08-16 11:36:14 +02:00
  • 127b6dbc6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-16 11:34:35 +02:00
  • df8851a53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-16 11:35:56 +02:00
  • df0b7155f6 Add missing french translation yflory 2017-08-16 11:35:40 +02:00
  • 8b5519ad29 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-16 11:31:09 +02:00
  • 2b7dcbe77c remove bs class that caused poor alignment sometimes ansuz 2017-08-16 11:30:56 +02:00
  • 4213d6de70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-16 11:29:59 +02:00
  • d6125d864c Added Yann's bio Caleb James DeLisle 2017-08-16 11:29:50 +02:00
  • a39f802b4d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-16 11:17:37 +02:00
  • 9213aa7ee4 simplify example config ansuz 2017-08-16 11:02:03 +02:00
  • e4d842ed08 Fix typos in the french translation yflory 2017-08-16 10:55:15 +02:00
  • 7537caf8fe make footer translateable ansuz 2017-08-16 10:51:08 +02:00
  • bd45aeaa03 bump package.json version ansuz 2017-08-16 10:31:47 +02:00
  • d3a298d639 Merge branch 'ui-integration' into staging ansuz 2017-08-16 10:20:34 +02:00
  • 8ee5e14a60 merge ui-integration ansuz 2017-08-16 10:20:05 +02:00
  • 40287f973c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-16 10:19:50 +02:00
  • b0b1ed037c Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable. Caleb James DeLisle 2017-08-16 10:19:24 +02:00
  • 130b330ede refactor messaging ansuz 2017-08-16 10:04:50 +02:00
  • fd3fd945c8 Updated the Log in Page CatalinScr 2017-08-16 07:56:18 +03:00
  • 1f4d0a0a56 Repaired a bug CatalinScr 2017-08-16 06:56:08 +03:00
  • dd48cf7c90 updated the register page CatalinScr 2017-08-15 23:47:36 +03:00
  • 3196d4558f repaired the responsive error at about page CatalinScr 2017-08-15 06:50:13 +03:00
  • 9a6bf302b4 ignore ckeditor hacks ansuz 2017-08-14 18:12:05 +02:00
  • 638a94785f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-14 16:24:17 +02:00
  • 723151254c remove a debug line before release which killed CSP Caleb James DeLisle 2017-08-14 16:23:56 +02:00
  • 7ca60e55a7 Lock the pad's inner-iframe down with CSP Caleb James DeLisle 2017-08-14 16:23:38 +02:00
  • 3960cd25f8 Updated the about page with the new design CatalinScr 2017-08-14 16:40:09 +03:00
  • 5e6e76dfc1 make regex case insensitive ansuz 2017-08-14 14:41:23 +02:00
  • 736288a85b lint compliance ansuz 2017-08-14 14:02:57 +02:00
  • 5037f444e9 update markdown sanitization strategy ansuz 2017-08-14 13:12:43 +02:00
  • 7c8df61f91 sed majik to switch 'What is CryptDrive' to 'What is CryptPad' Caleb James DeLisle 2017-08-11 17:54:15 +02:00
  • 196ce3b3f7 Fix alertify style which made the registration popup look bad Caleb James DeLisle 2017-08-11 17:49:19 +02:00
  • 878a565f89 tiny little performance improvement in something that really doesn't need it Caleb James DeLisle 2017-08-11 17:34:51 +02:00
  • 007db0b080 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-11 17:28:42 +02:00
  • 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 +02:00
  • 9b86003722 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-11 15:22:43 +02:00
  • 66cacf08da allow users to write with tabs instead of spaces ansuz 2017-08-11 15:21:26 +02:00
  • f580d9a30a *actually* fix alertify on mobile Pierre Bondoerffer 2017-08-11 15:16:51 +02:00
  • 8c0fe7d277 Add missing UI element translations Pierre Bondoerffer 2017-08-11 15:10:45 +02:00
  • 144f9f4c83 alertify fix on mobile Pierre Bondoerffer 2017-08-11 14:46:08 +02:00
  • 9833bd7e59 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-11 14:31:40 +02:00
  • 89a8e8050c Fix typo and also change message to explain itself better Caleb James DeLisle 2017-08-11 14:31:31 +02:00
  • 64849507b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-11 14:26:34 +02:00
  • 328107be4d translation key for using tabs ansuz 2017-08-11 14:26:08 +02:00
  • b00d37d9e7 proper namespace for font Pierre Bondoerffer 2017-08-11 14:14:58 +02:00
  • 0f74dffc48 fix register button being cut off Pierre Bondoerffer 2017-08-11 14:11:50 +02:00
  • 92d3b1a9fc actually pull in open-sans, move fonts to own include Pierre Bondoerffer 2017-08-11 14:10:54 +02:00
  • a5f9b49bfb make poll box bigger so it show text in smaller windows Pierre Bondoerffer 2017-08-11 13:09:34 +02:00
  • 82fadde249 restyle info-box in drive Pierre Bondoerffer 2017-08-11 13:04:03 +02:00
  • 958294f109 put code settings in their own tab ansuz 2017-08-11 13:00:50 +02:00
  • c8d7675ede remove z-index on splitter in code Pierre Bondoerffer 2017-08-11 12:56:42 +02:00
  • 17b986a6ca fix toolbar drive link (oops) Pierre Bondoerffer 2017-08-11 12:56:06 +02:00
  • ae0b2ca1a8 add label for code indentation ansuz 2017-08-11 12:55:10 +02:00
  • 7f2b7fc287 show Your CryptDrive, if logged in. fix typos ansuz 2017-08-11 11:32:21 +02:00
  • f4e5e67a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-11 11:00:06 +02:00
  • 284124a32d WIP ansuz 2017-08-11 10:59:54 +02:00
  • 4acd9957a9 Set the url if there is none Caleb James DeLisle 2017-08-11 10:40:57 +02:00
  • 33e73dd5e5 fixed one last fight Caleb James DeLisle 2017-08-10 21:40:34 +02:00
  • 9c0b0cc6a8 Merge branch 'staging' into pad2 Caleb James DeLisle 2017-08-10 18:39:16 +02:00
  • aa1563a731 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging Caleb James DeLisle 2017-08-10 18:32:27 +02:00
  • 1e56fa31c0 yay, they talk and they don't fight Caleb James DeLisle 2017-08-10 18:31:44 +02:00
  • 1c526feffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-10 18:06:58 +02:00
  • fbb880f277 implement customizable indentation widths ansuz 2017-08-10 18:06:47 +02:00
  • e786a66ff3 manual merge Caleb James DeLisle 2017-08-10 15:38:09 +02:00
  • ef256e3849 go to homepage when on infopages Pierre Bondoerffer 2017-08-10 15:17:34 +02:00
  • 04b84538e1 add Open Sans font (with bower) Pierre Bondoerffer 2017-08-10 15:05:57 +02:00
  • b3d349bf80 Merge branch 'staging' into pad2 Caleb James DeLisle 2017-08-10 14:53:12 +02:00
  • 8efac4e661 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging Caleb James DeLisle 2017-08-10 14:49:41 +02:00
  • 0dde1d7507 wip Caleb James DeLisle 2017-08-10 14:49:21 +02:00
  • baf64114a6 point to homepage in drive Pierre Bondoerffer 2017-08-10 14:45:56 +02:00
  • 9dce40f3af only add the splitter once Pierre Bondoerffer 2017-08-10 14:34:48 +02:00
  • 4026994310 make splitter work when scrolling Pierre Bondoerffer 2017-08-10 14:25:31 +02:00
  • 23ce2ed674 Merge pull request #166 from coldfix/master ansuz 2017-08-10 11:43:36 +02:00
  • 405526cfa5 Properly escape sed replace expressions Thomas Gläßle 2017-08-10 01:15:10 +02:00
  • 2caaaffc5d Merge branch 'staging' into pad2 Caleb James DeLisle 2017-08-10 10:11:21 +02:00
  • 1043e076a4 Merge branch 'ui-integration' into staging Caleb James DeLisle 2017-08-09 17:47:02 +02:00
  • c304071492 wip Caleb James DeLisle 2017-08-09 17:37:55 +02:00
  • 41c2f9bd83 Changed the footer, a modified the about page CatalinScr 2017-08-09 18:35:36 +03:00
  • e49a42db18 Merge branch 'staging' into pad2 Caleb James DeLisle 2017-08-09 16:28:51 +02:00
  • 1f9bd866c3 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging Caleb James DeLisle 2017-08-09 16:06:46 +02:00
  • edad5deeac fix logo not showing sometimes in chrome Pierre Bondoerffer 2017-08-09 16:06:29 +02:00
  • c036bb26be use proper bootstrap class Pierre Bondoerffer 2017-08-09 15:46:17 +02:00
  • 52565076b9 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging Caleb James DeLisle 2017-08-09 14:48:06 +02:00
  • 4b25ab80d6 wip Caleb James DeLisle 2017-08-09 14:45:39 +02:00
  • b34e252eda improve whiteboard styles Pierre Bondoerffer 2017-08-09 14:43:32 +02:00
  • 844967a880 continued refactoring ansuz 2017-08-09 14:20:37 +02:00
  • 8b2cb37c2f improve poll looks Pierre Bondoerffer 2017-08-09 12:33:40 +02:00
  • 280c10c57d alertify: use the right box-shadow Pierre Bondoerffer 2017-08-09 11:48:04 +02:00
  • 5821d3e72f remove useless title Pierre Bondoerffer 2017-08-09 11:25:58 +02:00
  • 82352b422f unhide show help button Pierre Bondoerffer 2017-08-09 11:24:28 +02:00
  • a4aeada585 make the file dialog placeholder visible, center file list Pierre Bondoerffer 2017-08-09 11:20:46 +02:00
  • d47e26efd5 add margin in code Pierre Bondoerffer 2017-08-09 11:17:14 +02:00
  • e08ed72653 generate the tooltip after the button Pierre Bondoerffer 2017-08-09 11:11:53 +02:00
  • 665e81912e put the tooltip on the actual button to prevent tippy from popping when not intended Pierre Bondoerffer 2017-08-09 11:06:06 +02:00