Commit Graph

29718 Commits

Author SHA1 Message Date
Vincent Petry 2f3e62a27f Fix oc:tags tag list serializer
Fixes propfind/proppatch of oc:tags
2016-01-22 14:07:26 +01:00
Thomas Müller 9b4c9a0357 Merge pull request #18531 from owncloud/ext-user-credentials
External storage 'Login credentials' auth mechanism
2016-01-22 13:14:14 +01:00
Thomas Müller 0bccdbc959 Merge pull request #21849 from owncloud/add-custom-marker-into-htaccess
Add custom marker into htaccess and execute integrity check after installation
2016-01-22 13:13:59 +01:00
Thomas Müller e3013a99ef Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-autoguessing
Use path instead of app id for occ app signing
2016-01-22 13:13:41 +01:00
Thomas Müller 969581cc68 Merge pull request #21847 from owncloud/issue-21807-default-app-icon
Add a default app icon for apps that don't have one
2016-01-22 12:53:40 +01:00
Lukas Reschke a0b383c5e8 Run on installer 2016-01-22 11:52:53 +01:00
Lukas Reschke bc62aa1ef5 Exclude .htaccess modifications from code checker
After the initial installation ownCloud will write some content into the .htaccess file such as the 404 or 403 directives. This adds a magic marker into the .htaccess file and only the content above this marker will be compared in the integrity checker.
2016-01-22 11:51:54 +01:00
Joas Schilling 3038006e8e Add a default app icon for apps that don't have one 2016-01-22 11:38:11 +01:00
Thomas Müller 6a3efc6f1b Merge pull request #21843 from owncloud/increase-version
Increase version due to new tables
2016-01-22 11:17:12 +01:00
Thomas Müller 57b17cdd98 Merge pull request #21826 from owncloud/dav-fix-user-deletion
No card ID when deleting is acceptable
2016-01-22 11:16:30 +01:00
Vincent Petry 7d1416fe12 Increase version due to new tables 2016-01-22 11:04:04 +01:00
Thomas Müller 1410120758 Merge pull request #20768 from owncloud/mount-cache
cache mountpoints in the db
2016-01-22 11:01:54 +01:00
Thomas Müller e2e5eedb40 Merge pull request #21824 from owncloud/list-of-notifiers
Make it possible to get a list of notifiers for a potential settings …
2016-01-22 10:24:46 +01:00
Thomas Müller 67c79faae0 Merge pull request #21840 from owncloud/fix-phpdoc
Fix PHPDoc - @changed is no official tag -> use @since
2016-01-22 10:24:26 +01:00
Joas Schilling 3cca8498cb Make it possible to get a list of notifiers for a potential settings page 2016-01-22 08:47:21 +01:00
Morris Jobke 75ee5a9e9a Fix PHPDoc - @changed is no official tag -> use @since 2016-01-22 08:43:05 +01:00
Thomas Müller 766ba1cd5f Merge pull request #21532 from owncloud/share2.0_getShares
[Share 2.0] get shares
2016-01-22 07:58:36 +01:00
Jenkins for ownCloud b74cdb7da3 [tx-robot] updated from transifex 2016-01-22 01:55:28 -05:00
Thomas Müller d4ff71c1b6 Merge pull request #21831 from owncloud/move-descriptive-tag-to-core
Move getDescriptiveTag to core
2016-01-21 16:31:52 +01:00
Thomas Müller ad39ca72d5 Merge pull request #21829 from owncloud/remove-duplicated-value
remove duplicated array value
2016-01-21 16:27:03 +01:00
Roeland Jago Douma 658959592d [Share 2.0] Fix displaying old shares proplery 2016-01-21 16:06:12 +01:00
Roeland Jago Douma 3a582e88e5 Comments from Vincent 2016-01-21 16:06:12 +01:00
Roeland Jago Douma 9b5ea18ce5 Add Unit tests for the default share provider 2016-01-21 16:06:12 +01:00
Roeland Jago Douma 0a9cd91e1d [Share 2.0] Add subfiles=x 2016-01-21 15:56:44 +01:00
Roeland Jago Douma 247b2ee0aa Add intergration test for shared_with me and group shares 2016-01-21 15:56:44 +01:00
Roeland Jago Douma 0c9f881e7d [Share 2.0] Resolve group shares 2016-01-21 15:56:44 +01:00
Roeland Jago Douma 01aa03341a Renable intergration test 2016-01-21 15:56:44 +01:00
Roeland Jago Douma 3666c34a19 [Sharing 2.0] Start with getShares 2016-01-21 15:56:44 +01:00
Joas Schilling f108dbfa6a Move getDescriptiveTag to core 2016-01-21 15:56:25 +01:00
Thomas Müller e2f231d051 Merge pull request #21761 from owncloud/share2_link
Share2 link
2016-01-21 15:43:08 +01:00
Thomas Müller 2b4532c6b9 Merge pull request #21797 from owncloud/proper-controller-in-core
Move controller in core/ to a common subfolder
2016-01-21 15:20:10 +01:00
Thomas Müller 5a4edeea70 Merge pull request #21808 from owncloud/testing-app-details
Testing app details
2016-01-21 14:29:11 +01:00
blizzz 7e853e2c69 remove duplicated array value 2016-01-21 13:59:36 +01:00
Thomas Müller 2540ac431c Merge pull request #21778 from owncloud/share-calendars
More tests for CalDAV
2016-01-21 12:31:26 +01:00
Joas Schilling df27a939ce No card ID when deleting is acceptable 2016-01-21 12:19:28 +01:00
Thomas Müller 7c7467fe42 Merge pull request #21792 from owncloud/systemtags-managerfactory
Allow custom implementation of system tag managers
2016-01-21 12:13:01 +01:00
Jan-Christoph Borchardt e6246bea73 testing app: fix app name capitalization 2016-01-21 12:12:43 +01:00
Jan-Christoph Borchardt 8bf7b8f538 testing app: add max version 2016-01-21 12:12:43 +01:00
Jan-Christoph Borchardt 89397d5949 testing app: add logo 2016-01-21 12:12:43 +01:00
Thomas Müller ec8022d241 Merge pull request #20847 from owncloud/systemtags-ui
System tags sidebar section
2016-01-21 12:12:40 +01:00
Jenkins for ownCloud 50b303f3ad [tx-robot] updated from transifex 2016-01-21 01:55:20 -05:00
Thomas Müller 2f7dcf1a2c Merge pull request #21782 from owncloud/update-system-addressbook-on-user-change-2
Introduce IUser::setEMailAddress and add hook mechanism
2016-01-21 00:07:46 +01:00
Roeland Jago Douma 88bc8634d2 Add Unit tests 2016-01-20 21:56:55 +01:00
Roeland Jago Douma 18421e7e68 Directly get from the server container
* Updated unit tests
2016-01-20 21:12:26 +01:00
Roeland Jago Douma 67f5216160 Do not use deprected activities API 2016-01-20 21:12:26 +01:00
Roeland Jago Douma 9467859e42 Get correct path for activity downloads 2016-01-20 21:12:26 +01:00
Roeland Jago Douma 894a88ca51 [Share 2.0] Make public link work without view 2016-01-20 21:12:26 +01:00
Roeland Jago Douma 8734ebe505 [Share 2.0] Make link share download use share manager 2016-01-20 21:12:26 +01:00
Roeland Jago Douma 717697313b [Share 2.0] Move tests over the sharemanager
Nice side effect... pure unit tests!
2016-01-20 21:12:26 +01:00
Roeland Jago Douma 0ebc92c44a [Share 2.0] Move showing link share to sharing 2.0 2016-01-20 21:12:26 +01:00