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

Commit Graph

  • ec011b15d5 remove duplicate css property Pierre Bondoerffer 2017-08-09 10:55:36 +02:00
  • 34ba673cd3 improve file upload UI Pierre Bondoerffer 2017-08-09 10:54:20 +02:00
  • 34a5a32c44 lint compliance ansuz 2017-08-08 20:29:02 +02:00
  • cdf3cee9c8 split out message rendering into ui ansuz 2017-08-08 18:21:03 +02:00
  • ca686f9c92 (hopefully) fix newline in lists when pasting links Pierre Bondoerffer 2017-08-08 17:47:10 +02:00
  • fcdfa52aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-08 17:13:38 +02:00
  • 58b3b32cc3 big messaging refactor. split UI from logic ansuz 2017-08-08 17:13:10 +02:00
  • 6ca6755d02 more missing titles in toolbar Pierre Bondoerffer 2017-08-08 16:51:23 +02:00
  • 2cc6c636db Add some missing titles Pierre Bondoerffer 2017-08-08 16:20:31 +02:00
  • d3f2398865 bump tippy to 1.2.0, add dynamicTitle option Pierre Bondoerffer 2017-08-08 16:19:44 +02:00
  • 8301bd44be Merge pull request #164 from pbondoer/staging ansuz 2017-08-08 14:46:25 +02:00
  • 85e383d5c5 add invisible splitter Pierre Bondoerffer 2017-08-08 14:36:04 +02:00
  • 355b7f1839 change recent to local pads Pierre Bondoerffer 2017-08-08 12:05:22 +02:00
  • 90075cd48e media-tag to less file Pierre Bondoerffer 2017-08-08 12:01:39 +02:00
  • d15280c6ce prevent pdfs from being huge Pierre Bondoerffer 2017-08-08 11:52:16 +02:00
  • c427f375dd add bootstrap css to /code for image uploader Pierre Bondoerffer 2017-08-08 11:48:17 +02:00
  • f585ddccdf fix image sizes in /slide/ Pierre Bondoerffer 2017-08-08 11:44:01 +02:00
  • 88be5444f0 change alertify warn color Pierre Bondoerffer 2017-08-08 10:37:37 +02:00
  • fc95f1b6a8 lint compliance ansuz 2017-08-08 10:32:25 +02:00
  • ba9696ba33 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-08 10:03:54 +02:00
  • a612f02be2 Merge branch 'staging' into pad2 Caleb James DeLisle 2017-08-07 17:49:03 +02:00
  • c63807fd2b implement channel.send ansuz 2017-08-07 17:24:16 +02:00
  • 35a55a15ed wip Caleb James DeLisle 2017-08-07 17:23:28 +02:00
  • d835005905 simplify in-memory message format ansuz 2017-08-07 17:22:56 +02:00
  • 8f285eba9f make file picker ui even prettier Pierre Bondoerffer 2017-08-07 17:22:54 +02:00
  • 797cc2b105 handle messages which fail to decrypt ansuz 2017-08-07 17:21:17 +02:00
  • 65dfd99171 major wip Caleb James DeLisle 2017-08-07 16:27:57 +02:00
  • c53e738054 improve file picker ui Pierre Bondoerffer 2017-08-07 16:27:29 +02:00
  • 798a3dc520 automatically fill in display name in poll Pierre Bondoerffer 2017-08-07 12:19:21 +02:00
  • 0588564bc9 overflow on poll div Pierre Bondoerffer 2017-08-07 11:49:10 +02:00
  • 996c56c242 fix label in register Pierre Bondoerffer 2017-08-07 11:41:04 +02:00
  • 008fa12755 alertify: add textarea + checkbox Pierre Bondoerffer 2017-08-07 11:26:40 +02:00
  • e486e47aa1 alertify: fix input color + better log styles Pierre Bondoerffer 2017-08-07 11:19:20 +02:00
  • 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 +02:00
  • be29236af1 fix pdfjs styles Pierre Bondoerffer 2017-08-07 10:47:30 +02:00
  • bad5160885 fix bad reference ansuz 2017-08-05 09:14:36 +02:00
  • 05aa5ed347 hide new feature until it is finished ansuz 2017-08-04 18:07:47 +02:00
  • e333e7903d fix styles overlapping Pierre Bondoerffer 2017-08-04 17:44:02 +02:00
  • 1db41dd17b Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Pierre Bondoerffer 2017-08-04 17:15:55 +02:00
  • dac14de18c unify fonts Pierre Bondoerffer 2017-08-04 17:15:45 +02:00
  • 5afadf10aa Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page CatalinScr 2017-08-04 17:58:48 +03:00
  • 3f6b234e97 Styled the general menu, footer, updated about CatalinScr 2017-08-04 17:58:29 +03:00
  • a16d4be3c4 show logged in user Pierre Bondoerffer 2017-08-04 16:48:01 +02:00
  • 8a56adfe53 make logos same size, compress Pierre Bondoerffer 2017-08-04 16:25:39 +02:00
  • d3fb6313b6 color logo on topbar Pierre Bondoerffer 2017-08-04 16:22:43 +02:00
  • 865ba0731c better colors? not sure yet... Pierre Bondoerffer 2017-08-04 16:13:27 +02:00
  • 1bd42f0b3e make alertify darker Pierre Bondoerffer 2017-08-04 16:02:35 +02:00
  • 244f436f6e resolve merge conflict ansuz 2017-08-04 16:01:20 +02:00
  • 2a8311396e lint compliance ansuz 2017-08-04 16:00:06 +02:00
  • 395f6e1b27 reset confirm text for alertify ansuz 2017-08-04 15:54:15 +02:00
  • eaf5c73b05 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into front-page Caleb James DeLisle 2017-08-04 15:47:34 +02:00
  • dd6a057962 add 'msg' class for pierre ansuz 2017-08-04 15:45:30 +02:00
  • 0f7124d673 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Caleb James DeLisle 2017-08-04 15:26:59 +02:00
  • ecc766eb7b remove useless margin Pierre Bondoerffer 2017-08-04 15:24:58 +02:00
  • a6547d1ed0 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Caleb James DeLisle 2017-08-04 15:20:14 +02:00
  • 7310960f46 remove the hack around the hack to fix the hack Pierre Bondoerffer 2017-08-04 15:19:59 +02:00
  • 95c7cd3fcc Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Caleb James DeLisle 2017-08-04 15:17:22 +02:00
  • addd91cc72 fix styles (again) copyright cjd 2017 Pierre Bondoerffer 2017-08-04 15:16:48 +02:00
  • 930ba8aec6 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Caleb James DeLisle 2017-08-04 15:13:09 +02:00
  • 5c21a9048e fix styles Pierre Bondoerffer 2017-08-04 15:13:03 +02:00
  • b26c62714f Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Caleb James DeLisle 2017-08-04 15:08:21 +02:00
  • c953e71a18 better class generation and remove duplicate class Pierre Bondoerffer 2017-08-04 15:06:58 +02:00
  • 4d563af045 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Caleb James DeLisle 2017-08-04 14:51:14 +02:00
  • 10e50fc5c7 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Pierre Bondoerffer 2017-08-04 14:50:44 +02:00
  • 6614f3f0e6 put the page class on html element Pierre Bondoerffer 2017-08-04 14:50:35 +02:00
  • 96b12d55fb add a return ansuz 2017-08-04 14:37:21 +02:00
  • b79adf4177 redirect to drive if logged in ansuz 2017-08-04 14:35:47 +02:00
  • c895d06193 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-04 14:26:31 +02:00
  • 252f40748a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-04 14:21:26 +02:00
  • a10214ed2a Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page Caleb James DeLisle 2017-08-04 14:19:54 +02:00
  • 75c0876500 Added ludovic's bio Caleb James DeLisle 2017-08-04 14:19:44 +02:00
  • 043ae4280b repaired the menu CatalinScr 2017-08-04 15:15:47 +03:00
  • 250d85bb8a Repaired the menu, clead the code CatalinScr 2017-08-04 15:15:35 +03:00
  • e2ad99ab3c change favicon (again) Pierre Bondoerffer 2017-08-04 14:06:10 +02:00
  • 9865359bb0 don't tell users about new versions ansuz 2017-08-04 14:05:00 +02:00
  • 8831f4f91b new favicons Pierre Bondoerffer 2017-08-04 14:02:53 +02:00
  • a70c527482 Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page Pierre Bondoerffer 2017-08-04 12:32:26 +02:00
  • 4018c7e0a6 move alertify stuff Pierre Bondoerffer 2017-08-04 12:31:47 +02:00
  • c274a27dfb Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js Caleb James DeLisle 2017-08-04 11:33:28 +02:00
  • c8c44d3bfc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-04 11:22:22 +02:00
  • 0d1f19f5d4 Big manual merge Caleb James DeLisle 2017-08-04 11:20:17 +02:00
  • e7d09c1ddb Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page changed the menu CatalinScr 2017-08-04 12:16:33 +03:00
  • d4ce7d626c Modified the menu CatalinScr 2017-08-04 12:16:13 +03:00
  • f8c7140eec make fonts big Pierre Bondoerffer 2017-08-04 11:10:30 +02:00
  • f6d45d05f6 use logo in toolbar Pierre Bondoerffer 2017-08-04 11:01:26 +02:00
  • 1b83e15796 sorry jpg, i forgot you existed Pierre Bondoerffer 2017-08-04 10:49:18 +02:00
  • 5ce7d64b2c add pierre photo Pierre Bondoerffer 2017-08-04 10:30:19 +02:00
  • 1b466d250f Add some photos Caleb James DeLisle 2017-08-03 18:01:48 +02:00
  • 5d70dd93b3 Manual merge Caleb James DeLisle 2017-08-03 17:18:03 +02:00
  • 15fa801bc8 work in progress CatalinScr 2017-08-03 18:09:25 +03:00
  • 11c72499a0 don't add duplicate messages to the history ansuz 2017-08-03 17:06:28 +02:00
  • bc15ce7de5 Manual merge Caleb James DeLisle 2017-08-03 17:00:46 +02:00
  • 52e9ba92fa Update whitepaper link and also change whatis_zeroknowledge Caleb James DeLisle 2017-08-03 16:23:29 +02:00
  • 89ab82c0e2 Changed the menu, added the logo on top bar CatalinScr 2017-08-03 17:19:55 +03:00
  • ae176b0465 about page mockup Pierre Bondoerffer 2017-08-03 15:58:51 +02:00
  • fb13e656b7 get new messages when reconnecting ansuz 2017-08-03 15:06:06 +02:00
  • 52854c5a8e ignore history range responses ansuz 2017-08-03 15:05:04 +02:00
  • e786117110 get new messages when reconnecting and WIP get more history ansuz 2017-08-03 15:04:29 +02:00
  • 2ce341fed6 disable input field when disconnected ansuz 2017-08-03 14:12:07 +02:00
  • aba4e34e7f reuse inline styles as a mixin ansuz 2017-08-03 12:17:33 +02:00