Commit graph

635 commits

Author SHA1 Message Date
brantje f49d989331
Add demo data for acl table 2016-10-08 23:29:24 +02:00
Marcos Zuriaga e2faab8f4d
NotFoundJSONResponse unit tests 2016-10-08 18:47:15 +02:00
Marcos Zuriaga 1e8d742c01
Utils class simplification of microtime method
utils unit tests
2016-10-08 18:24:30 +02:00
Marcos Zuriaga c6097bfc5f
Add permissions entity backend uint tests 2016-10-08 17:32:07 +02:00
Sander 0c60679a3a Merge pull request #77 from nextcloud/fixInvalidKeySize
Use .getActiveVault().vaultKey instead of stored password
2016-10-08 16:28:50 +02:00
brantje 1adfb1db96
Use .getActiveVault().vaultKey instead of stored password, which can be empty 2016-10-08 16:20:34 +02:00
Sander 57486d1ffa Merge pull request #76 from nextcloud/fixNgDupes
Fix for ng-dupes
2016-10-08 16:13:27 +02:00
brantje b195831482
Fix for ng-dupes 2016-10-08 16:07:35 +02:00
Sander ded7aa2aed Merge pull request #75 from nextcloud/fixVaultPreferences
Fix pwSettings not loading
2016-10-08 15:57:10 +02:00
brantje 21420db06a
Fix pwSettings not loading 2016-10-08 15:48:42 +02:00
Sander 386465cd51 Merge pull request #74 from nextcloud/cleanUp
Clean up
2016-10-08 15:06:01 +02:00
brantje adb7dd582b
Remove comment
Fix if statement

Add return

Add return

Remove assignment
2016-10-08 15:00:07 +02:00
Sander 5c95911b25 Merge pull request #70 from nextcloud/exporter
Add export functionality
2016-10-08 14:30:07 +02:00
brantje e17f52bdd0
Merge branch 'exporter' 2016-10-08 14:29:46 +02:00
Sander df6ee4e15b Merge branch 'master' into exporter 2016-10-08 14:24:19 +02:00
brantje 06aefd2b76
Small fix 2016-10-08 14:05:42 +02:00
brantje 57756606e7
Format files 2016-10-08 14:00:07 +02:00
brantje 3208590aa5
Use for loop without keys 2016-10-08 13:56:17 +02:00
brantje e96911e50f
Revert "Scrutinizer Auto-Fixes"
This reverts commit ae73bff5c4.
2016-10-08 13:45:44 +02:00
brantje 6dc3ddf63f
Revert "Scrutinizer Auto-Fixes"
This reverts commit 33ef75ac2f.
2016-10-08 13:45:34 +02:00
brantje 061bac9744
Indicate that PassmanExporter is a global var 2016-10-08 13:42:13 +02:00
brantje b4870bc2f3
Indicate that C_Promise is a global var 2016-10-08 13:41:08 +02:00
brantje 517db468a1
Fix missing ; 2016-10-08 13:34:48 +02:00
brantje 5bb92a0656
Remove console.log 2016-10-08 13:27:49 +02:00
brantje 842e27d439
Add export functionality 2016-10-08 13:26:48 +02:00
brantje f7cb2a4c6d
Merge branch 'createTests' 2016-10-08 12:32:47 +02:00
brantje 8f6ab6cacf
fix conflicts 2016-10-08 12:28:29 +02:00
brantje 41dd5058ba
Remove stable9.1 from tests 2016-10-08 02:04:24 +02:00
brantje a218cebc91
Add stable9.1 to tests 2016-10-08 02:02:45 +02:00
brantje 7e98f3431b
Update travis. 2016-10-08 01:57:08 +02:00
brantje c46311b774
Update travis.. 2016-10-08 01:49:43 +02:00
brantje 7e776b4fab
Update travis.. 2016-10-08 01:49:33 +02:00
brantje d50810eba0
Update travis. 2016-10-08 01:40:23 +02:00
brantje 682552b808
Update travis 2016-10-08 01:39:29 +02:00
brantje fe0553b241
Update travis 2016-10-08 01:37:24 +02:00
brantje e11b7742f0
Update travis 2016-10-08 01:35:17 +02:00
brantje 70307089d5
Update travis 2016-10-08 01:32:00 +02:00
brantje 6f96a3ba51
Update travis 2016-10-08 01:31:36 +02:00
Sander 27c5da4028 Merge pull request #67 from nextcloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2016-10-08 01:27:41 +02:00
Sander 44be53ff7d Merge branch 'master' into scrutinizer-patch-1 2016-10-08 01:18:54 +02:00
Sander 304e61e2de Merge pull request #68 from nextcloud/scrutinizer-patch-2
Scrutinizer Auto-Fixes
2016-10-08 01:18:45 +02:00
Scrutinizer Auto-Fixer 33ef75ac2f Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-10-07 23:01:16 +00:00
Scrutinizer Auto-Fixer ae73bff5c4 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-10-07 22:59:30 +00:00
brantje cee3ea9865
Update readme 2016-10-08 00:41:35 +02:00
brantje 74575abf7c
Remove comment 2016-10-08 00:24:53 +02:00
brantje 3afc3c9c9c
Fix OC_App - private class must not be instantiated 2016-10-08 00:20:02 +02:00
brantje 2c40097036
OC_App - Static method of private class must not be called 2016-10-08 00:13:40 +02:00
brantje 12764c5a4f
Remove ->__toString() call 2016-10-08 00:11:40 +02:00
brantje fe690de354
Fix travis errors in Utility/PermissionEntity 2016-10-08 00:06:51 +02:00
brantje 724a3b33ff
Fix travis errors in ShareService 2016-10-08 00:05:43 +02:00