Commit Graph

925 Commits (8ccd845d521037023a7596579f310f432c41b5e3)

Author SHA1 Message Date
ansuz 1c3f1a15cd make sure that /pad is resized after loading 2017-01-09 17:02:01 +01:00
yflory 5b08fed7fa Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
2017-01-09 16:29:16 +01:00
ansuz a3cd100c94 apply yflory's safari patch 2017-01-09 11:46:51 +01:00
ansuz 0373556475 support old hashes in /poll 2017-01-09 11:46:21 +01:00
yflory d5561910d4 Move the file manager into /drive and add a toolbar 2017-01-06 18:26:41 +01:00
yflory 1e70af0c16 Use the same network for the apps and the file store 2017-01-06 13:52:53 +01:00
yflory bf764d26e7 Merge branch 'staging' into workgroups 2017-01-06 11:17:17 +01:00
yflory 3836b20b08 enable the file store 2017-01-06 11:16:56 +01:00
yflory b0d4dad417 Fix creation of a new file manager object 2017-01-05 18:43:00 +01:00
yflory 5a8f0df19e Add support for reconnecting websocket 2017-01-05 18:42:18 +01:00
ansuz b33661d9d5 don't toggle maximization state after setting 2017-01-05 15:21:17 +01:00
ansuz e56cc49f79 catch errors that popped up because of a cross-origin iframe 2017-01-05 14:14:26 +01:00
ansuz 5080751a90 hide unnecessary scrollbar 2017-01-05 10:58:10 +01:00
ansuz 95617a11c8 fix broken paths in old poll 2017-01-05 10:57:13 +01:00
yflory 7a0442afe0 Drag and drop files into a workgroup 2017-01-04 18:24:20 +01:00
ansuz 05a956879a prepare new poll app for release
move old poll into poll/old
2017-01-04 15:48:50 +01:00
ansuz 5cd714b18a configure filestore usage via customize/application_config.js 2017-01-03 12:10:11 +01:00
ansuz 2b5085625c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-01-02 15:43:06 +01:00
yflory 69b1764c9d Missing entries in the context menu with users 2017-01-02 15:42:29 +01:00
ansuz c6499d6789 make panel styles reusable 2016-12-30 15:30:35 +01:00
ansuz 34967ac354 encapsulate rendering functions so we can pass in cryptpad-common 2016-12-30 13:27:01 +01:00
ansuz 66b8c93205 remember time of first visit 2016-12-30 13:23:09 +01:00
ansuz ba4df1a22c create examples directory with old prototypes 2016-12-30 13:22:15 +01:00
ansuz 0abf45bdc5 better fsStore debugging 2016-12-30 12:27:58 +01:00
ansuz e3f79f914a fix user hash 2016-12-29 18:12:30 +01:00
ansuz d232a5a83e Revert "simplify key generation and remember user's additional keys"
This reverts commit 75786ff9ff.
2016-12-29 17:51:58 +01:00
ansuz 91a806ab86 focus on OK button when we pop an alert 2016-12-29 17:10:59 +01:00
ansuz 850bd42149 don't try to display things that don't exist 2016-12-29 17:05:28 +01:00
ansuz 75786ff9ff simplify key generation and remember user's additional keys 2016-12-29 17:04:48 +01:00
ansuz 621476424d make strings translatable and refocus on correct input 2016-12-29 17:04:01 +01:00
ansuz a97696c712 show user's display name and account name 2016-12-29 17:03:17 +01:00
ansuz 3560f0580f commit prototype upload script 2016-12-28 17:23:57 +01:00
ansuz 2f9f3d921a trim excess whitespace from usernames 2016-12-28 17:13:41 +01:00
ansuz 89e5830409 make alertify display time configurable 2016-12-28 17:13:00 +01:00
ansuz 49d80d91d9 don't load customize/pad.js anymore 2016-12-28 15:53:27 +01:00
ansuz f020fd5a75 remove /customize/pad.js from main apps 2016-12-28 15:12:22 +01:00
ansuz aae443c8e9 replace old poll app with new 2016-12-28 11:44:48 +01:00
ansuz 387f4ebf5d add this important js file I forgot 2016-12-28 11:01:14 +01:00
ansuz 8f0de589dc add missing cp class to more html 2016-12-28 10:45:14 +01:00
ansuz e9376a66c2 apply 'cp' class for unified styles 2016-12-27 14:29:20 +01:00
ansuz 8b034a9554 better flow and animations for login page 2016-12-27 12:32:20 +01:00
ansuz db12b5e896 move text for login page into translation file 2016-12-27 12:31:16 +01:00
ansuz 5e1d8292c5 guard against trying to parse special fragments 2016-12-26 14:23:17 +01:00
ansuz 51067430f9 more restructuring of user app 2016-12-26 14:19:29 +01:00
ansuz a4ed2388e2 use 'box' class 2016-12-26 14:19:02 +01:00
ansuz eb620bee77 restructure user application 2016-12-26 14:17:39 +01:00
yflory a10eac2773 Fix lint errors 2016-12-22 18:16:38 +01:00
ansuz 52a593c2c2 fix jshint complaints 2016-12-22 17:27:56 +01:00
ansuz 53a4d4738a really make sure you're logged out 2016-12-22 17:22:32 +01:00
ansuz 63cd5c16ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login 2016-12-22 17:20:30 +01:00
yflory 81259fc25f Refresh unsorted and templates when files data changes 2016-12-22 17:20:05 +01:00
ansuz 5534da8abf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login 2016-12-22 16:54:51 +01:00
yflory 9b6c9e3891 Add support for templates in the file manager 2016-12-22 16:53:38 +01:00
ansuz acfc27f5c5 fix merge conflicts 2016-12-22 16:53:03 +01:00
ansuz 3197b62fbb latest work 2016-12-22 16:44:49 +01:00
ansuz 29d406b7a9 implement cryptput 2016-12-22 16:00:13 +01:00
ansuz 84d5e4b35d better tools for playing with template code 2016-12-22 11:03:44 +01:00
yflory 1772cc93c8 Fix the taildoc bug 2016-12-22 11:02:12 +01:00
yflory 87abfff66b Fix Flash Of Unstyled Content (fouc) 2016-12-21 18:33:21 +01:00
ansuz 86cda4357b handle more possible cases 2016-12-21 18:24:48 +01:00
ansuz 1682d23c1c remove old user prototype 2016-12-21 18:06:05 +01:00
yflory 046220f239 Add info boxes for the different categories 2016-12-21 11:46:49 +01:00
yflory 403ba53980 Fix typo error 2016-12-21 10:22:48 +01:00
yflory e9418af88b Add an info box in the file manager 2016-12-20 18:59:50 +01:00
yflory c359c27997 Use user object as default store in file manager 2016-12-20 17:27:45 +01:00
yflory 4aed585574 Fix style issues in the toolbar 2016-12-20 14:40:00 +01:00
yflory f9db7e588e Fix unused backup in localStorage 2016-12-20 14:37:29 +01:00
yflory c7e63f63fd Use the user object in file manager if it exists 2016-12-20 11:30:04 +01:00
ansuz 6778a7062d Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging 2016-12-20 11:23:54 +01:00
ansuz bd6992da0a create a random hash 2016-12-20 11:13:15 +01:00
ansuz 2cd50498c2 add log(in|out) functions to common 2016-12-20 11:11:40 +01:00
ansuz dfea802c77 better crypto hygeine, start thinking more about ui 2016-12-20 11:09:41 +01:00
yflory e3f484d876 File manager in the home page, lint 2016-12-19 17:53:03 +01:00
ansuz 7df460c766 implement createChannelId api 2016-12-19 14:55:39 +01:00
ansuz 3698fe8b0e Merge branch 'soon' into login 2016-12-19 12:51:57 +01:00
ansuz 5a14db9f07 Merge branch 'test-filemanager' into login 2016-12-19 12:37:28 +01:00
ansuz dd46b9425a Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-19 12:37:02 +01:00
yflory 4646d5c866 Add suport for read-only mode in the file manager 2016-12-19 12:35:13 +01:00
ansuz 2a624a0b60 add example usage for cryptget.js 2016-12-19 12:25:36 +01:00
ansuz 303953a431 Merge branch 'soon' into login 2016-12-19 11:04:46 +01:00
ansuz 6b9529b121 implement ajax-like functionality for zk docs 2016-12-19 10:59:18 +01:00
yflory 5bc7766f44 Use a consistent toolbar across all apps 2016-12-16 18:35:49 +01:00
ansuz 8a7fda6341 Merge branch 'soon' into login 2016-12-16 18:10:35 +01:00
ansuz a220742f68 fix reversed color settings 2016-12-16 15:31:22 +01:00
ansuz 308db7fa79 fix uncolored /pad/ content in IE 2016-12-16 15:25:06 +01:00
ansuz 67baf30d65 basic outline of logins 2016-12-16 15:19:17 +01:00
ansuz 2968488278 convert uint8 arrays to hex 2016-12-16 15:18:06 +01:00
yflory d95a3ac92e Fix an issue when deleting a key from the proxy 2016-12-16 11:41:45 +01:00
yflory 82f3d5f852 Open the file manager of someone else 2016-12-13 18:59:04 +01:00
ansuz c0d96fb10d Merge branch 'login' into test-filemanager 2016-12-13 11:21:18 +01:00
yflory c3e3aa69c3 Merge branch 'fileManager' into fmIndex 2016-12-12 18:27:19 +01:00
ansuz 5d335ba796 Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-12 18:25:07 +01:00
yflory 8e6830d080 Fix file manager with a chosen hash 2016-12-12 18:24:45 +01:00
yflory 2b077a8e95 add the file manager in the main page 2016-12-12 18:03:06 +01:00
ansuz f36d15d0db Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-12 18:03:00 +01:00
yflory b7f2ef97c7 Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager 2016-12-12 12:05:31 +01:00
yflory fdb5c2ddb5 Fix UI issues with rename and delete actions 2016-12-12 12:03:54 +01:00
yflory 319ce5d8c8 Fix the code app 2016-12-12 10:35:28 +01:00
yflory ee56f5608f Fix the infinite spinner bug with the file manager store 2016-12-08 18:52:36 +01:00
yflory 43ccd11adc Merge branch 'infiniteSpinner' into fileManagerMerge 2016-12-08 16:03:18 +01:00