Commit Graph

29671 Commits

Author SHA1 Message Date
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
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
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
Roeland Jago Douma e40d21673e [Share 2.0] Add fetching link shares to share manager 2016-01-20 21:12:26 +01:00
Vincent Petry 899f9bd113 Allow custom implementation of system tag managers
Added config.php option to replace the default implementation of system
tag manager and system tag object mapper.

Also adjusted the comments manager factory to inject the server container
2016-01-20 16:36:10 +01:00
Thomas Müller 647d8ea5de Merge pull request #21775 from owncloud/apcu-iterator-constructor
Fix constructor arguments for APCUIterator
2016-01-20 15:23:01 +01:00
Thomas Müller 77069f5582 Use IUser::setEMailAddress in ldap as well 2016-01-20 15:21:33 +01:00
Frank Karlitschek 9b581de0f8 Merge pull request #21805 from owncloud/app-dependency-spacing
remove unneeded margin of app dependencies in app mgmt
2016-01-20 15:05:45 +01:00
Thomas Müller 51b50bd260 Emit OC\User::changeUser on change of display name 2016-01-20 14:57:20 +01:00
Thomas Müller f16ddef96a React on OC_User::changeUser hook and update the user's vcard 2016-01-20 14:57:20 +01:00
Thomas Müller aeb89947a2 Introduce IUser::setEMailAddress and add hook mechanism 2016-01-20 14:57:20 +01:00
Jan-Christoph Borchardt 6cc975e1cf remove unneeded margin of app dependencies in app mgmt 2016-01-20 14:11:01 +01:00
Vincent Petry 5d4bb4b9c1 Adjust system tags app max version 2016-01-20 14:03:02 +01:00
Vincent Petry 38cacd9405 Fix app metadata/test issues for system tags app 2016-01-20 12:26:50 +01:00
Vincent Petry cc0f0a940e Fix content type parsing in system tags plugin 2016-01-20 11:51:06 +01:00
Thomas Müller dd733d8925 Merge pull request #20804 from owncloud/fix-ldap-process-user-wo-displayname
LDAP: do not attempt to process user records without display name, fi…
2016-01-20 11:33:26 +01:00
Thomas Müller 5652981600 Merge pull request #21793 from owncloud/di_shareproviderfactory
Properly DI the servercontainer into share provider factory
2016-01-20 11:32:59 +01:00
Thomas Müller c9dcf5ceba Merge pull request #21795 from owncloud/remove-unneeded-markup
Remove unneeded markup for scan process - ref #20545
2016-01-20 11:30:28 +01:00
Morris Jobke d6a63016ae move lost controller to core/controller
* lostpassword.css is unneeded since #11696 is merged - 1b50d4f7ce
* js is already in core/js
* css is moved to core/css/lostpassword
* template is moved to core/templates/lostpassword
2016-01-20 10:42:19 +01:00
Morris Jobke c2a1a02fe4 move user controller to core/controller 2016-01-20 10:23:57 +01:00
Morris Jobke 06fe4cabfc move setup controller to core/controller 2016-01-20 10:23:57 +01:00
Morris Jobke b97fe97875 move avatar controller to core/controller 2016-01-20 10:23:52 +01:00
Morris Jobke 61c104dcde Remove unneeded markup for scan process - ref #20545 2016-01-20 10:09:59 +01:00
Roeland Jago Douma 7a946a05f5 Properly DI the servercontainer 2016-01-20 08:33:36 +01:00
Jenkins for ownCloud f076bfac32 [tx-robot] updated from transifex 2016-01-20 01:54:54 -05:00
Thomas Müller 33171f5c78 Merge pull request #21785 from owncloud/cron-sync-system-addressbook
Add daily cron job to sync system address book
2016-01-20 07:29:10 +01:00
Vincent Petry ffba6d0a7e Added system tags GUI in sidebar
Added files details sidebar panel to assign/unassign/rename/delete
system tags.
2016-01-19 16:24:26 +01:00
Vincent Petry 8d41cbb97a Implement toggleselect extension for select2
To make it possible to toggle selected values inside the dropdown
2016-01-19 16:24:26 +01:00
Thomas Müller c1d8d60754 Add back the current-user-principal test suite 2016-01-19 15:33:57 +01:00
Thomas Müller c13e489fb7 Merge pull request #21724 from owncloud/fix-occ-app-management-for-group-apps
Fix occ app management for group apps
2016-01-19 15:21:16 +01:00