summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20719 from owncloud/adding-system-addressbook-of-usersThomas Müller2015-12-0224-75/+939
|\ | | | | Adding system addressbook for users of this instance - a occ command …
| * Fix endless recursionThomas Müller2015-12-023-11/+25
| |
| * Fix update of avatar imageThomas Müller2015-12-022-33/+49
| |
| * Fix commentsThomas Müller2015-12-023-5/+5
| |
| * Fix getCloudIdThomas Müller2015-12-022-1/+8
| |
| * Proposal: add enumeration function to IUserManager which simply calls a ↵Thomas Müller2015-12-023-24/+54
| | | | | | | | callbask for each user in all backends
| * Adding unit test for User::getCloudId()Thomas Müller2015-12-021-0/+18
| |
| * Specify the email type and set name properlyThomas Müller2015-12-022-14/+66
| |
| * Add converter to generate/update a vcard from a given userThomas Müller2015-12-023-23/+218
| |
| * Add system principal to cal of each cardThomas Müller2015-12-022-0/+49
| |
| * Add the user's cloud id to the vCardThomas Müller2015-12-026-44/+60
| |
| * Add user's email address to vCardThomas Müller2015-12-021-2/+7
| |
| * Update addressbook home configuration for CalDAVTesterThomas Müller2015-12-022-6/+6
| |
| * user and system addressbooks are now living in sub foldersThomas Müller2015-12-027-15/+78
| |
| * Adding a second principal backend which holds system principals - as of now ↵Thomas Müller2015-12-023-15/+191
| | | | | | | | only one principals/system/system
| * Add IUser::getAvatarImage() for easy accessThomas Müller2015-12-025-7/+51
| |
| * Adding system addressbook for users of this instance - a occ command is ↵Thomas Müller2015-12-026-2/+181
| | | | | | | | supplied for synchronizing
* | Merge pull request #20896 from owncloud/reduce-oc_config-usageThomas Müller2015-12-024-8/+10
|\ \ | | | | | | Reduce OC_Config usage in lib/
| * | Reduce OC_Config usage in lib/Morris Jobke2015-12-024-8/+10
| | | | | | | | | | | | * replaced by proper public interfaces
* | | Merge pull request #20895 from owncloud/reduce-legacy-footprint-apps-managementThomas Müller2015-12-023-5/+40
|\ \ \ | |/ / |/| | Remove OC_Config from app management template
| * | Remove OC_Config from app management templateMorris Jobke2015-12-023-5/+40
|/ / | | | | | | * add unit test for this case
* | Merge pull request #20875 from owncloud/remove-changepropagatorThomas Müller2015-12-028-865/+0
|\ \ | | | | | | remove old propagation logic
| * | remove old propagation logicRobin Appelman2015-12-018-865/+0
| | |
* | | Merge pull request #20891 from owncloud/check-for-cliMorris Jobke2015-12-021-7/+7
|\ \ \ | | | | | | | | Execute only for web and not for CLI
| * | | Execute only for web and not for CLILukas Reschke2015-12-021-7/+7
|/ / /
* | | Merge pull request #20889 from owncloud/fix-logout-for-bjoernLukas Reschke2015-12-022-1/+9
|\ \ \ | | | | | | | | Ensure trailing slash in URIs
| * | | Add a trailing slash to generated URLsLukas Reschke2015-12-021-1/+1
| | | |
| * | | Ensure that ownCloud is always accessed with a trailing slashLukas Reschke2015-12-021-0/+8
|/ / /
* | | Merge pull request #20884 from owncloud/fix_20713Thomas Müller2015-12-021-1/+3
|\ \ \ | | | | | | | | Respect disabled incoming federated shares
| * | | [Sharing] Respect disabled incoming federated sharesRoeland Jago Douma2015-12-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only fetch the incoming federated shares if incoming shares are actually enabled. Fixes #20713
* | | | Merge pull request #20879 from ↵Thomas Müller2015-12-023-15/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/check-if-rewrite-base-is-set-if-rewrite-is-active Check if rewrite base is set if rewrite is active
| * | | | fix indentationMorris Jobke2015-12-021-4/+4
| | | | |
| * | | | Set RewriteBase to / if OC::WEBROOT is not setLukas Reschke2015-12-011-1/+2
| | | | |
| * | | | Append PATH_INFO to ensure that file can be loaded on updateLukas Reschke2015-12-011-3/+2
| | | | |
| * | | | Disable MultiView + DirectorySlashLukas Reschke2015-12-011-1/+5
| | | | | | | | | | | | | | | | | | | | Required for routes that might otherwise collide with existing folders on the system
| * | | | Set "SetEnv" within base `.htaccess` fileLukas Reschke2015-12-013-14/+16
| | | | | | | | | | | | | | | | | | | | mod_rewrite as used by the front controller may require a `RewriteBase` in case the installation is done using an alias. Since we cannot enforce a writable `.htaccess` file this will move the `front_controller_active` environment variable into the main .htaccess file. If administrators decide to have this one not writable they can still enable this feature by setting the `front_controller_active` environment variable within the Apache config.
* | | | | Merge pull request #20867 from owncloud/add-quota-behat-testThomas Müller2015-12-025-5/+47
|\ \ \ \ \ | | | | | | | | | | | | Add quota behat test
| * | | | | fix code styleMorris Jobke2015-12-011-2/+2
| | | | | |
| * | | | | add parameter to call single behat testsMorris Jobke2015-12-011-1/+1
| | | | | |
| * | | | | add behat tests for 0 quota upload failureMorris Jobke2015-12-014-2/+44
| | | | | |
* | | | | | Merge pull request #20865 from owncloud/post-delete-metaThomas Müller2015-12-026-23/+108
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add metadata to post delete hooks
| * | | | | | Add metadata to post delete hooksRobin Appelman2015-12-016-23/+108
| | | | | | |
* | | | | | | Merge pull request #20874 from owncloud/allow-di-mimetypedetectorThomas Müller2015-12-021-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow DI for OCP\Files\IMimeTypeDetector
| * | | | | | | Allow DI for OCP\Files\IMimeTypeDetectorJoas Schilling2015-12-011-0/+4
| | | | | | | |
* | | | | | | | Merge pull request #20877 from owncloud/fix-empty-expirationDateThomas Müller2015-12-021-1/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Check the expiration date for null
| * | | | | | | Check the expiration date for nullMorris Jobke2015-12-011-1/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * null is always less than any value -> expirationDate gets null which is "no date set" * ref https://github.com/owncloud/core/issues/20590#issuecomment-158393075
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0212-10/+36
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #20883 from owncloud/avatar_diRoeland Douma2015-12-027-126/+266
|\ \ \ \ \ \ | |/ / / / / |/| | | | | DI in avatar code
| * | | | | DI in avatar codeRoeland Jago Douma2015-12-017-126/+266
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * DI in avatar code * Use the node API * More unit tests * Unit tests no longer require DB
* | | | | Merge pull request #14081 from owncloud/use-pretty-urlsLukas Reschke2015-12-019-5/+61
|\ \ \ \ \ | |_|_|_|/ |/| | | | Support pretty URLs