Commit Graph

  • 75c3c10b20 Merge branch 'soon' into staging yflory 2017-06-09 15:56:45 +0200
  • c1402fbb0a Lint error yflory 2017-06-09 15:56:18 +0200
  • b36484931d Lint yflory 2017-06-09 15:55:46 +0200
  • 1fb638f519 clean the code yflory 2017-06-09 15:50:13 +0200
  • 9d758a040b Fix an issue with the search field not displayed properly yflory 2017-06-09 15:45:46 +0200
  • 08902c0910 drop extraneous argument ansuz 2017-06-09 15:33:28 +0200
  • 23318357a6 make fewer RPC calls for usageBar ansuz 2017-06-09 15:33:03 +0200
  • df586a223c update limits, usage, plan, and note whenever they are checked ansuz 2017-06-09 15:31:43 +0200
  • 8bad0c556e change log to error ansuz 2017-06-09 15:29:55 +0200
  • b0e00d337e more careful validation ansuz 2017-06-09 15:28:53 +0200
  • fd88162624 Merge branch 'staging' into newDrive yflory 2017-06-09 14:47:37 +0200
  • 7c9e86e351 Merge branch 'soon' into staging yflory 2017-06-09 14:47:15 +0200
  • 9694272083 Fix html code not parsed yflory 2017-06-09 14:42:55 +0200
  • 9ca10ba524 Merge branch 'staging' into newDrive yflory 2017-06-09 14:40:26 +0200
  • 7f120c8fc1 Merge branch 'soon' into staging yflory 2017-06-09 14:38:36 +0200
  • 78e6118153 Merge branch 'staging' into newDrive yflory 2017-06-09 14:38:21 +0200
  • 444c41974e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-09 14:37:54 +0200
  • df5cbfb53e Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon yflory 2017-06-09 14:36:38 +0200
  • 6a96aa6819 Disconnect the network when migrating the drive in another tab yflory 2017-06-09 14:36:35 +0200
  • 2a94bdaf05 test yflory 2017-06-09 12:29:19 +0200
  • ca95b5c42b Remove unused console.log yflory 2017-06-09 12:31:07 +0200
  • f8c69573fd Disconnect other tabs when migrating the drive yflory 2017-06-09 12:23:28 +0200
  • c4e5741ae0 update upgrade button logic ansuz 2017-06-09 12:12:39 +0200
  • f1a9002417 use upgradeURL with usage bar ansuz 2017-06-09 10:46:11 +0200
  • 51e0d40572 Make sure the old storage key is removed after migration yflory 2017-06-08 18:35:20 +0200
  • b0fe04381d Merge branch 'staging' into newDrive yflory 2017-06-08 18:14:31 +0200
  • fe2fef5e4c support dragging and dropping multiple files ansuz 2017-06-08 18:12:17 +0200
  • 1c2ea04f11 Drive refactoring yflory 2017-06-08 17:52:00 +0200
  • 8bee45d0f4 don't try to replace undefined ansuz 2017-06-08 15:27:28 +0200
  • 52975a2f09 allow users to pin the first time, even if they are over their limit ansuz 2017-06-08 15:26:51 +0200
  • fe42f5e88c ask for new cookies and resend commands on NO_COOKIE errors ansuz 2017-06-08 14:19:14 +0200
  • e723228060 always show upgrade button in drive ansuz 2017-06-08 14:03:01 +0200
  • 192a517e64 handle nonexistent files in getUploadSize ansuz 2017-06-08 14:02:26 +0200
  • 5bd7e19ddd guard against invalid channels, make session expiration time configurable ansuz 2017-06-08 14:02:06 +0200
  • aa296eadff pass correct argument into getFileSize ansuz 2017-06-08 14:00:48 +0200
  • da533b106a improve type checking in getFileSize ansuz 2017-06-08 11:24:12 +0200
  • 5cbfc1a23c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-07 10:14:51 +0200
  • 2f851ab97e fix lint errors ansuz 2017-06-07 10:13:51 +0200
  • aa9aaefdea Add frame-ancestors to allow remote auth Caleb James DeLisle 2017-06-07 09:51:10 +0200
  • d25477e8c6 don't let tooltips interfere with DOM interaction ansuz 2017-06-06 18:08:23 +0200
  • 811d031ffd Fix the 'File' entry in the drive 'New' menu yflory 2017-06-06 12:09:55 +0200
  • f1271bfd03 Missing file yflory 2017-06-06 11:56:22 +0200
  • 5641a4a839 Add the file app in the 'new' dropdown menus yflory 2017-06-06 11:52:47 +0200
  • ac91d2f413 Fix the upgrade and donate buttons in the home page yflory 2017-06-06 11:37:54 +0200
  • ee57458158 Remove the pin limit alert yflory 2017-06-06 10:49:32 +0200
  • 85f1fb86d0 Add missing french translation keys yflory 2017-06-06 10:28:00 +0200
  • f43132a63b bump version in footer and package.json ansuz 2017-06-06 10:01:07 +0200
  • ec9a4dec5e Merge branch 'soon' into staging ansuz 2017-06-05 11:43:26 +0200
  • cc85e674f1 Merge branch 'master' into soon ansuz 2017-06-05 11:43:02 +0200
  • 8d4017b79e fix parse error ansuz 2017-06-05 11:35:05 +0200
  • b9b8352633 Traditional Chinese jxtsai 2017-06-05 15:10:13 +0800
  • 77d4ffba86 animate preview mode sidebar ansuz 2017-06-02 17:39:45 +0200
  • 65233c2464 remove unused variable ansuz 2017-06-02 16:16:17 +0200
  • 767793b5ca fix stuck loading tip ansuz 2017-06-02 12:13:11 +0200
  • 8f7aaecc1c cache some selectors and decrease memory demands ansuz 2017-06-02 11:45:54 +0200
  • f6e443aeb2 put cookie requests back on authenticated rpc list ansuz 2017-06-02 11:45:07 +0200
  • 6db5b4b559 ignore blobstage ansuz 2017-06-01 18:16:37 +0200
  • f631973f1f optimize file upload ansuz 2017-06-01 18:16:02 +0200
  • eb78ed072a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-01 14:27:17 +0200
  • 55af84cc90 lower spinner timeout interval ansuz 2017-06-01 14:27:06 +0200
  • 7bf17c0d32 drop edge and IE from the test matrix Caleb James DeLisle 2017-06-01 10:56:11 +0200
  • 282095f674 disable failing tests ansuz 2017-06-01 10:40:41 +0200
  • c65ca5cfc6 restore deleted line and add missing semicolon ansuz 2017-06-01 10:35:42 +0200
  • 26251a5c9c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-01 10:26:55 +0200
  • 6eb3b6800f try safari 9 Caleb James DeLisle 2017-06-01 10:27:30 +0200
  • bd3dcebf1f add registration to tests ansuz 2017-06-01 10:26:46 +0200
  • 8a09083fd7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-01 10:24:03 +0200
  • 8bd9ad8847 add automated registration test ansuz 2017-06-01 10:23:50 +0200
  • 07279c8dc7 export boolean Test.testing ansuz 2017-06-01 10:23:24 +0200
  • 337dd99b06 lets see if safari will work with this... Caleb James DeLisle 2017-06-01 10:15:57 +0200
  • 90060dde4c added back safari Caleb James DeLisle 2017-06-01 10:08:16 +0200
  • 50082cfd19 Remove safari which is failing weirdly and fix race Caleb James DeLisle 2017-06-01 00:50:36 +0200
  • 92ab8d88ba accept defeat Caleb James DeLisle 2017-06-01 00:41:31 +0200
  • c8bd1bb2ac Trying to improve the tests which fail always when running remotely Caleb James DeLisle 2017-06-01 00:29:17 +0200
  • 71bd808e4f Send everything through the test global function Caleb James DeLisle 2017-06-01 00:09:39 +0200
  • 244bd7b378 ;;; Caleb James DeLisle 2017-05-31 23:32:47 +0200
  • 7d557df74b a new and more horrible way of sniffing the logs out of the instance Caleb James DeLisle 2017-05-31 23:29:58 +0200
  • 68296e9d23 one too many quote marks Caleb James DeLisle 2017-05-31 20:51:56 +0200
  • 3ca41d8df7 Change the testing matrix Caleb James DeLisle 2017-05-31 20:49:03 +0200
  • 0d4b74cfba ;;;;;; keep these ;;; for later ;;;;; Caleb James DeLisle 2017-05-31 19:46:23 +0200
  • 24f37ea414 Delicious testing Caleb James DeLisle 2017-05-31 19:40:17 +0200
  • 5e57578fa9 Merge branch 'master' of github.com:xwiki-labs/cryptpad ansuz 2017-05-31 18:44:55 +0200
  • 30f66ab7ba hotfix 'undefined/' bug ansuz 2017-05-31 18:44:44 +0200
  • 7b94106bac fix inverted conditional :/ ansuz 2017-05-31 18:15:31 +0200
  • 2e03485db4 remove known bad entries from localStorage.userHash... ansuz 2017-05-31 18:12:58 +0200
  • 936bf8df9d return falsey if userHash is junk ansuz 2017-05-31 18:08:41 +0200
  • 105e5cdac9 fix 'undefined/' userHash ansuz 2017-05-31 18:01:12 +0200
  • 401e908963 use media-tag with xhr error handling ansuz 2017-05-31 17:17:01 +0200
  • 1a8c964fde Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-31 15:31:51 +0200
  • 087bcd2ea5 update default config with new CSP values ansuz 2017-05-31 15:21:29 +0200
  • 96a5b5bbc1 Merge branch 'soon' into staging Caleb James DeLisle 2017-05-31 15:01:09 +0200
  • f37b313efc jshint node=true Caleb James DeLisle 2017-05-31 15:00:41 +0200
  • 69a72d71de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-05-31 13:05:56 +0200
  • 5050023b6a pinneddata can now show you what is unpinned Caleb James DeLisle 2017-05-31 13:05:49 +0200
  • 3465710237 Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag ansuz 2017-05-31 12:55:05 +0200
  • 82f5d3c96f abstract checks for authenticated RPCs ansuz 2017-05-31 12:51:26 +0200
  • 8ab9248a78 Fix ES6 Daniel RADEAU 2017-05-31 12:42:37 +0200
  • d774f8771b remove more unused files ansuz 2017-05-31 12:23:31 +0200
  • 540304807c remove unused files ansuz 2017-05-31 12:11:33 +0200
  • 21c39572be Update media-tag and fix bower dependencies Daniel RADEAU 2017-05-31 11:53:25 +0200