Commit graph

1007 commits

Author SHA1 Message Date
brantje
9a466e2c3f
Merge branch 'fixPassPackDescription' 2016-10-14 15:49:08 +02:00
brantje
47d594c023
Add a warning when a reencryptCredential is running 2016-10-14 15:49:08 +02:00
brantje
d5a123abf4
Use global namespace for importers 2016-10-14 15:49:08 +02:00
brantje
456b3742d6
Merge branch 'passmanImportDescription' 2016-10-14 15:49:08 +02:00
brantje
9b7931d5a0
Correct passpack description 2016-10-14 15:49:08 +02:00
brantje
d7cef52bac
Merge branch 'resharingMessage' 2016-10-14 15:49:08 +02:00
brantje
f3703f6991
Add description field to import 2016-10-14 15:49:08 +02:00
brantje
60e89c84a7
Merge branch 'updateReadme' 2016-10-14 15:49:08 +02:00
brantje
32816aa32d
Show a message when a user changes the "shared" with list 2016-10-14 15:49:08 +02:00
brantje
6f690164f2
Update readme 2016-10-14 15:49:08 +02:00
Marcos Zuriaga
286476a546
Fixed some types on sharerequest entity
Added partial unit test for sharerequest mapper
Changed some assertEquals to assertSame so we don't do loosy type checks
2016-10-14 15:39:33 +02:00
brantje
fdbff0d0f6
Update readme 2016-10-12 23:06:11 +02:00
brantje
0fe250cfe1
Update readme 2016-10-12 22:24:08 +02:00
brantje
5e1b457c14
Check if description is set before replacing newlines 2016-10-12 21:56:35 +02:00
brantje
401da2bd55
Merge branch 'removeUnusedCode' 2016-10-12 20:54:08 +02:00
brantje
696e585444
Remove unused function 2016-10-12 20:44:31 +02:00
brantje
61d27ac1b6
Remove unused code 2016-10-12 20:33:45 +02:00
brantje
1a74def8dc
Remove unused code 2016-10-12 20:16:37 +02:00
brantje
b658e2a4ca
Merge branch 'renameDescription' 2016-10-12 20:14:41 +02:00
brantje
5fb3bb3d57
Rename description labels to notes.
In the code .description property is still used.
Upon save all html tags will be stripped.
2016-10-12 19:35:36 +02:00
Marcos Zuriaga
61dbcedfa4
Removed unused var from mapper constructor 2016-10-12 19:23:12 +02:00
brantje
3e1e9368a5
Merge branch 'publicFileDownload' 2016-10-12 19:11:51 +02:00
Marcos Zuriaga
5186648889
Added unit test for SharingACLMapper
Renamed some vars
Added launch_phpunit.sh to gitignore
2016-10-12 19:08:59 +02:00
brantje
0d7cf6e055
Download files from link shared credential
Add missing ;
2016-10-12 19:07:46 +02:00
brantje
82314fadc3
getFile should be public accessible.
This because public shared credentials can contain files.
2016-10-12 18:56:31 +02:00
brantje
126232c695
Merge branch 'fixLinkSharing' 2016-10-12 18:44:58 +02:00
brantje
d0fa4bd27c
Removed required instance of IUser
This because when using link sharing $UserId is not an instance
of IUser.
2016-10-12 18:24:25 +02:00
brantje
1c1f583d11
Merge branch 'loginOnEnter' 2016-10-12 18:16:38 +02:00
brantje
5714248835
Login to selected vault on enter press 2016-10-12 18:07:30 +02:00
brantje
8d01af481c
Merge branch 'allowHttpLocalhost' 2016-10-12 18:02:04 +02:00
brantje
b3352d1190
Hide http warning on localhost 2016-10-12 17:56:44 +02:00
brantje
7d7f9e6800
Merge branch 'titleFix' 2016-10-12 00:42:55 +02:00
brantje
f5fe2c7873
Fix title width 2016-10-12 00:32:31 +02:00
Marcos Zuriaga
9c53219346
Removed unused method and variable 2016-10-11 23:15:45 +02:00
Marcos Zuriaga
3f2bb33ce3
Changed unit test env var names 2016-10-11 22:33:48 +02:00
Sander
0c673c54cd
Rename drone config 2016-10-11 15:40:02 +02:00
Marcos Zuriaga
efd27ee1ae
Fix truncate table 2016-10-11 02:06:04 +02:00
Marcos Zuriaga
1f30ccc963
Added Database testing base class
Added VaultMapper unit tests
Edited some VaultMapper docs and changed a function to use the Utils implementation
Added coverage phpunit annotations
2016-10-11 01:41:32 +02:00
Marcos Zuriaga
d909d780b3
Removed TODO 2016-10-10 02:16:10 +02:00
Marcos Zuriaga
652be86567
Refactored to use assertEquals where applicable,
so in case of errors the messages are more meaningful
2016-10-10 02:15:00 +02:00
brantje
0b716a4d5f
Remove double matrix 2016-10-09 20:28:56 +02:00
brantje
02d783f39b
Fix MC 2016-10-09 20:25:01 +02:00
brantje
9fbcf6aefc
update travis 2016-10-09 19:57:42 +02:00
brantje
2ec6d1ea91
Add owncloud to tests 2016-10-09 19:26:15 +02:00
brantje
65c2111cb5
Merge branch 'changeCIConfig' 2016-10-09 18:44:55 +02:00
brantje
d48b218f65
Update readme 2016-10-09 18:35:34 +02:00
brantje
a18aa0a0d1
Change travis config, add scrutinizer config 2016-10-09 18:29:31 +02:00
brantje
2c48aab40d
Merge branch 'fixLoadingVaultKeySettings' 2016-10-09 18:26:27 +02:00
Marcos Zuriaga
d6e4f32ec8
Added EntityJSONSerializer trait unit tests 2016-10-09 18:24:14 +02:00
brantje
c488b3b50c
Small cleanup
Small fix for loading vaultkey
2016-10-09 18:09:52 +02:00