Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• a5407e9222 rework templates and build system ansuz 2016-12-28 15:52:16 +01:00
• c9d99f101a rewrite customize/readme.md ansuz 2016-12-28 15:33:59 +01:00
• 13e8bf5b5e remove old 'user' code ansuz 2016-12-28 15:33:40 +01:00
• f0a4c0ccb0 sheet.js is never used ansuz 2016-12-28 15:24:04 +01:00
• 2be90e8858 remove Header.html ansuz 2016-12-28 15:18:39 +01:00
• 0a89f13498 don't need /customize/pad.js anymore ansuz 2016-12-28 15:15:25 +01:00
• f020fd5a75 remove /customize/pad.js from main apps ansuz 2016-12-28 15:09:44 +01:00
• aae443c8e9 replace old poll app with new ansuz 2016-12-28 11:44:42 +01:00
• 387f4ebf5d add this important js file I forgot ansuz 2016-12-28 11:01:14 +01:00
• 8f0de589dc add missing cp class to more html ansuz 2016-12-28 10:45:14 +01:00
• 46024853ec restrict cryptpad styles to descendants of .cp ansuz 2016-12-27 14:30:13 +01:00
• e9376a66c2 apply 'cp' class for unified styles ansuz 2016-12-27 14:10:20 +01:00
• 5a4ec358b3 Merge branch 'soon' into staging ansuz 2016-12-27 13:36:23 +01:00
• 71488e6651 add link to markdown tutorial ansuz 2016-12-27 13:36:02 +01:00
• bc49e143b8 give alertify popups their own bg var ansuz 2016-12-27 12:33:21 +01:00
• 8b034a9554 better flow and animations for login page ansuz 2016-12-27 12:32:20 +01:00
• db12b5e896 move text for login page into translation file ansuz 2016-12-27 12:31:16 +01:00
• f9da200381 resolve merge conflicts in translations ansuz 2016-12-26 14:25:02 +01:00
• 5e1d8292c5 guard against trying to parse special fragments ansuz 2016-12-26 14:23:17 +01:00
• 51067430f9 more restructuring of user app ansuz 2016-12-26 14:19:29 +01:00
• a4ed2388e2 use 'box' class ansuz 2016-12-26 14:19:02 +01:00
• eb620bee77 restructure user application ansuz 2016-12-26 14:17:39 +01:00
• a10eac2773 Fix lint errors yflory 2016-12-22 18:16:38 +01:00
• 4476fd4006 s/readOnly/readonly ansuz 2016-12-22 18:15:18 +01:00
• a4690239d3 Merge branch 'master' of github.com:pbondoer/cryptpad into espanol ansuz 2016-12-22 18:09:29 +01:00
• 52a593c2c2 fix jshint complaints ansuz 2016-12-22 17:27:40 +01:00
• 25c8ea464b Merge branch 'soon' into login ansuz 2016-12-22 17:22:42 +01:00
• 53a4d4738a really make sure you're logged out ansuz 2016-12-22 17:22:32 +01:00
• 63cd5c16ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login ansuz 2016-12-22 17:20:30 +01:00
• 81259fc25f Refresh unsorted and templates when files data changes yflory 2016-12-22 17:20:05 +01:00
• 5534da8abf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login ansuz 2016-12-22 16:54:51 +01:00
• 21360801de change a few english keys ansuz 2016-12-22 16:54:17 +01:00
• 9b6c9e3891 Add support for templates in the file manager yflory 2016-12-22 16:53:35 +01:00
• acfc27f5c5 fix merge conflicts ansuz 2016-12-22 16:53:03 +01:00
• 3197b62fbb latest work ansuz 2016-12-22 16:44:49 +01:00
• 29d406b7a9 implement cryptput ansuz 2016-12-22 16:00:13 +01:00
• 84d5e4b35d better tools for playing with template code ansuz 2016-12-22 11:03:44 +01:00
• 1772cc93c8 Fix the taildoc bug yflory 2016-12-22 11:02:12 +01:00
• 3b10217fb0 fixed buttons breaking responsive layout Pierre BONDOERFFER 2016-12-22 04:54:28 +01:00
• f5e7a6f0c8 Fixed up Spanish translation 🇪🇸 Pierre BONDOERFFER 2016-12-22 03:34:31 +01:00
• 87582d41a9 Added alt tags to English translation Pierre BONDOERFFER 2016-12-22 03:34:12 +01:00
• 87abfff66b Fix Flash Of Unstyled Content (fouc) yflory 2016-12-21 18:33:21 +01:00
• 86cda4357b handle more possible cases ansuz 2016-12-21 18:24:48 +01:00
• 1682d23c1c remove old user prototype ansuz 2016-12-21 18:06:05 +01:00
• 046220f239 Add info boxes for the different categories yflory 2016-12-21 11:46:49 +01:00
• 403ba53980 Fix typo error yflory 2016-12-21 10:22:48 +01:00
• e9418af88b Add an info box in the file manager yflory 2016-12-20 18:59:50 +01:00
• 1f762ce55b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2016-12-20 17:27:59 +01:00
• c359c27997 Use user object as default store in file manager yflory 2016-12-20 17:27:45 +01:00
• 820537f7e3 rebuild css ansuz 2016-12-20 16:54:36 +01:00
• 4991bfab92 rebuild css ansuz 2016-12-20 16:54:36 +01:00
• 280a6c462a implement white image correctly ansuz 2016-12-20 16:41:05 +01:00
• 5c46fa7c65 implement white image correctly ansuz 2016-12-20 16:41:05 +01:00
• 4aed585574 Fix style issues in the toolbar yflory 2016-12-20 14:40:00 +01:00
• f9db7e588e Fix unused backup in localStorage yflory 2016-12-20 14:37:29 +01:00
• 959983cc8b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2016-12-20 11:31:06 +01:00
• c7e63f63fd Use the user object in file manager if it exists yflory 2016-12-20 11:30:04 +01:00
• 9dbe583f4b Merge branch 'soon' into staging ansuz 2016-12-20 11:27:26 +01:00
• 835c33113e Merge branch 'master' of github.com:gustavohmsilva/cryptpad into soon ansuz 2016-12-20 11:25:09 +01:00
• 6778a7062d Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging ansuz 2016-12-20 11:23:54 +01:00
• 5a39caf95a new messages for login ansuz 2016-12-20 11:16:49 +01:00
• bd6992da0a create a random hash ansuz 2016-12-20 11:13:15 +01:00
• 2cd50498c2 add log(in|out) functions to common ansuz 2016-12-20 11:11:40 +01:00
• dfea802c77 better crypto hygeine, start thinking more about ui ansuz 2016-12-20 11:09:41 +01:00
• fc19626ead Revised TOD for better comprehension Gustavo H M Silva 2016-12-19 16:43:02 -02:00
• e3f484d876 File manager in the home page, lint yflory 2016-12-19 17:53:03 +01:00
• 88dcd2ecc3 FP correction & revision for better comprehension gustavohmsilva 2016-12-19 13:23:45 -02:00
• 7df460c766 implement createChannelId api ansuz 2016-12-19 14:55:39 +01:00
• 3698fe8b0e Merge branch 'soon' into login ansuz 2016-12-19 12:51:57 +01:00
• 5a14db9f07 Merge branch 'test-filemanager' into login ansuz 2016-12-19 12:37:28 +01:00
• dd46b9425a Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager ansuz 2016-12-19 12:37:02 +01:00
• 4646d5c866 Add suport for read-only mode in the file manager yflory 2016-12-19 12:35:13 +01:00
• 2a624a0b60 add example usage for cryptget.js ansuz 2016-12-19 12:25:36 +01:00
• 5de926493a Merge branch 'soon' into login ansuz 2016-12-19 12:11:18 +01:00
• df9f408823 Improve French translation of index.html Valentin Lorentz 2016-12-19 11:51:21 +01:00
• e8f27ba7a0 Merge branch 'review-french-translation' of github.com:ProgVal/cryptpad into francais ansuz 2016-12-19 11:39:49 +01:00
• 3dd5748f7f integrate brazilian portuguese translation ansuz 2016-12-19 11:32:15 +01:00
• d6229e31a4 Merge branch 'master' of github.com:gustavohmsilva/cryptpad into merge-ptbr ansuz 2016-12-19 11:20:05 +01:00
• 2a06b8137e Merge pull request #68 from mateon1/soon ansuz 2016-12-19 11:17:55 +01:00
• 303953a431 Merge branch 'soon' into login ansuz 2016-12-19 11:04:46 +01:00
• 6b9529b121 implement ajax-like functionality for zk docs ansuz 2016-12-19 10:59:18 +01:00
• 481f3a42f7 Apply corrections to the Polish translation mateon1 2016-12-16 23:18:00 +01:00
• 98bbe678e9 Finished translation to Brazilian Portuguese gustavohmsilva 2016-12-16 17:56:45 -02:00
• 270fda6243 About 60% translated already to Brazilian Portuguese gustavohmsilva 2016-12-16 16:10:58 -02:00
• 5bc7766f44 Use a consistent toolbar across all apps yflory 2016-12-16 18:35:49 +01:00
• 8a7fda6341 Merge branch 'soon' into login ansuz 2016-12-16 18:10:35 +01:00
• d09983ac92 s/kenntnisfreier/zero knowledge ansuz 2016-12-16 17:54:50 +01:00
• 2ee2ffcfac resolve conflicts in german PR ansuz 2016-12-16 17:38:53 +01:00
• a220742f68 fix reversed color settings ansuz 2016-12-16 15:31:22 +01:00
• af2d9cb5b1 Merge branch 'merge-polish' into soon ansuz 2016-12-16 15:29:24 +01:00
• 308db7fa79 fix uncolored /pad/ content in IE ansuz 2016-12-16 15:25:06 +01:00
• 2ee5ef2289 add english translations for login ansuz 2016-12-16 15:21:37 +01:00
• f13eb28252 add support for translating placeholders ansuz 2016-12-16 15:20:01 +01:00
• 67baf30d65 basic outline of logins ansuz 2016-12-16 15:19:17 +01:00
• 2968488278 convert uint8 arrays to hex ansuz 2016-12-16 15:18:06 +01:00
• d95a3ac92e Fix an issue when deleting a key from the proxy yflory 2016-12-16 11:27:59 +01:00
• 1f82a44f95 Merge branch 'master' of github.com:xwiki-labs/cryptpad Michael Achmann 2016-12-13 20:18:18 +01:00
• 3ee7f4e96b Added German translation Michael Achmann 2016-12-13 20:14:22 +01:00
• 82f3d5f852 Open the file manager of someone else yflory 2016-12-13 18:59:04 +01:00
• c0d96fb10d Merge branch 'login' into test-filemanager ansuz 2016-12-13 11:21:18 +01:00