Commit Graph

817 Commits (21360801debeb93684985a2fe24df4b2224f7f14)

Author SHA1 Message Date
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
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 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
yflory 05fd6c1563 Fix the infinite spinner problem 2016-12-08 16:01:46 +01:00
yflory 5cd7d8ec84 Fix undefined userid in new poll 2016-12-08 10:19:23 +01:00
yflory cb43eb9ca1 Merge branch 'newpoll' into fileManagerMerge 2016-12-07 16:59:43 +01:00
yflory 9b3719e0ae Merge branch 'soon' into fileManagerMerge 2016-12-07 16:59:32 +01:00
yflory b7b4a034a3 Merge branch 'soon' into newpoll 2016-12-07 16:58:28 +01:00
yflory ddc99cecb1 Fix lint errors 2016-12-07 12:22:27 +01:00
yflory f26cdb1a21 Fix UI issues, unclickable user column, add confirm dialog 2016-12-07 11:44:09 +01:00
yflory 6feb8548b3 Prevent the proxy handlers from being called on the parents 2016-12-07 11:12:35 +01:00