Commit Graph

669 Commits (c3d1554e8cc353abfe7b5d31847265f330cf3098)

Author SHA1 Message Date
yflory 706120ae5b Display images uploaded in the File app with the Media app 2017-05-04 18:24:58 +02:00
yflory 28cb40d7ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 17:14:30 +02:00
yflory 1b6fae4dd2 Update mediatag 2017-05-04 17:14:24 +02:00
ansuz a0c420af8e jshint compliance 2017-05-04 16:37:25 +02:00
ansuz 1864dac84f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 16:16:16 +02:00
ansuz 78b11584f8 remove unused variables 2017-05-04 16:16:09 +02:00
yflory 4335b050af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 16:08:21 +02:00
yflory a190c99426 Toolbar refactoring 2017-05-04 16:08:12 +02:00
ansuz 7573b86946 call back with error if an RPC is made while disconnected 2017-05-04 11:36:24 +02:00
ansuz 410a9dfb17 temporary solution for testing pin limits 2017-05-04 11:20:52 +02:00
yflory ef89451a83 Display the storage limit in the drive 2017-05-02 17:14:53 +02:00
ansuz f2672d587a fix variable redefinition 2017-05-02 09:42:51 +02:00
ansuz 0e7eeb285c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-29 14:24:14 +02:00
yflory f414d480a9 Add the history mode to the CryptDrive 2017-04-28 18:23:41 +02:00
ansuz cf4dee28f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 17:13:18 +02:00
ansuz 28e4ef1b13 WIP RPC code 2017-04-28 17:11:50 +02:00
yflory afb0061d7b Fix an issue with anonymous user unable to store new pads 2017-04-28 17:11:07 +02:00
yflory 56aaeea003 Fix the drive toolbar not displaying the displayName 2017-04-28 17:03:47 +02:00
ansuz 3fa0a73025 prevent using string methods on undefined variable 2017-04-28 16:09:46 +02:00
ansuz 1b3ce5aa96 fix typo 2017-04-28 16:08:47 +02:00
yflory a51a35da70 Fix an issue with hashes ending with a slash 2017-04-28 15:47:31 +02:00
yflory ef58120819 Prevent multiple concurrent clicks to get the history 2017-04-28 14:09:59 +02:00
yflory 16f6ab813c Make it clear that the number is the history represents a version 2017-04-28 13:06:55 +02:00
yflory c820b3485c Fix function undefined when loading a template 2017-04-28 12:16:45 +02:00
yflory 0ef1c14d7f Fix lint errors 2017-04-28 12:12:17 +02:00
yflory fc760b4820 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 12:08:21 +02:00
yflory a165332c15 Don't store a pad in the drive if the limit has been reached 2017-04-28 12:08:05 +02:00
ansuz e51c7f9cf0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 11:46:24 +02:00
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 2017-04-27 18:46:46 +02:00
ansuz aedc46bdaf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-27 12:47:27 +02:00
ansuz a97e7223f1 implement getBlobPathFromHex 2017-04-27 12:47:21 +02:00
yflory 520dabe094 Remove the unsorted files category 2017-04-26 18:46:40 +02:00
yflory f50aa5c29b Move the mediatag viewer into a media app 2017-04-26 14:55:06 +02:00
yflory 6a8274518b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 18:42:33 +02:00
yflory 9882a3a923 Add support for the file applicaiton in the drive 2017-04-25 18:42:21 +02:00
ansuz 12898b3358 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 18:28:48 +02:00
ansuz 74bcec8b31 programming is hard okay 2017-04-25 18:28:39 +02:00
yflory 2a417ddae8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 17:22:07 +02:00
yflory d985b144cc Add a new hash version for the file viewer 2017-04-25 17:19:13 +02:00
ansuz 3309087277 send feedback if isArray is not supported 2017-04-25 17:09:39 +02:00
ansuz 5194677443 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 14:57:34 +02:00
yflory c9c7d61ad1 Media tag viewer 2017-04-25 14:55:38 +02:00
ansuz 729d1460b9 Merge branch 'master' into staging 2017-04-25 14:35:24 +02:00
ansuz a840fb9e85 add example hashes and start working on hash v2 2017-04-25 14:33:57 +02:00
ansuz d1fa68e30d build UCF Media Tag 2017-04-24 17:13:32 +02:00
yflory fdd51ec18d Don't remove a folder moved into unsorted or into itself 2017-04-24 15:38:03 +02:00
ansuz 4fdc5f897e only feedback migration if user had legacy store 2017-04-24 14:26:55 +02:00
ansuz 218f2ff76c feedback when logging in or registering 2017-04-24 14:15:17 +02:00
yflory 4c3e842664 Fix focus issues with the history input in ckeditor 2017-04-24 13:55:03 +02:00
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +02:00