Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20719 from owncloud/adding-system-addressbook-of-users | Thomas Müller | 2015-12-02 | 24 | -75/+939 |
|\ | | | | | Adding system addressbook for users of this instance - a occ command … | ||||
| * | Fix endless recursion | Thomas Müller | 2015-12-02 | 3 | -11/+25 |
| | | |||||
| * | Fix update of avatar image | Thomas Müller | 2015-12-02 | 2 | -33/+49 |
| | | |||||
| * | Fix comments | Thomas Müller | 2015-12-02 | 3 | -5/+5 |
| | | |||||
| * | Fix getCloudId | Thomas Müller | 2015-12-02 | 2 | -1/+8 |
| | | |||||
| * | Proposal: add enumeration function to IUserManager which simply calls a ↵ | Thomas Müller | 2015-12-02 | 3 | -24/+54 |
| | | | | | | | | callbask for each user in all backends | ||||
| * | Adding unit test for User::getCloudId() | Thomas Müller | 2015-12-02 | 1 | -0/+18 |
| | | |||||
| * | Specify the email type and set name properly | Thomas Müller | 2015-12-02 | 2 | -14/+66 |
| | | |||||
| * | Add converter to generate/update a vcard from a given user | Thomas Müller | 2015-12-02 | 3 | -23/+218 |
| | | |||||
| * | Add system principal to cal of each card | Thomas Müller | 2015-12-02 | 2 | -0/+49 |
| | | |||||
| * | Add the user's cloud id to the vCard | Thomas Müller | 2015-12-02 | 6 | -44/+60 |
| | | |||||
| * | Add user's email address to vCard | Thomas Müller | 2015-12-02 | 1 | -2/+7 |
| | | |||||
| * | Update addressbook home configuration for CalDAVTester | Thomas Müller | 2015-12-02 | 2 | -6/+6 |
| | | |||||
| * | user and system addressbooks are now living in sub folders | Thomas Müller | 2015-12-02 | 7 | -15/+78 |
| | | |||||
| * | Adding a second principal backend which holds system principals - as of now ↵ | Thomas Müller | 2015-12-02 | 3 | -15/+191 |
| | | | | | | | | only one principals/system/system | ||||
| * | Add IUser::getAvatarImage() for easy access | Thomas Müller | 2015-12-02 | 5 | -7/+51 |
| | | |||||
| * | Adding system addressbook for users of this instance - a occ command is ↵ | Thomas Müller | 2015-12-02 | 6 | -2/+181 |
| | | | | | | | | supplied for synchronizing | ||||
* | | Merge pull request #20896 from owncloud/reduce-oc_config-usage | Thomas Müller | 2015-12-02 | 4 | -8/+10 |
|\ \ | | | | | | | Reduce OC_Config usage in lib/ | ||||
| * | | Reduce OC_Config usage in lib/ | Morris Jobke | 2015-12-02 | 4 | -8/+10 |
| | | | | | | | | | | | | * replaced by proper public interfaces | ||||
* | | | Merge pull request #20895 from owncloud/reduce-legacy-footprint-apps-management | Thomas Müller | 2015-12-02 | 3 | -5/+40 |
|\ \ \ | |/ / |/| | | Remove OC_Config from app management template | ||||
| * | | Remove OC_Config from app management template | Morris Jobke | 2015-12-02 | 3 | -5/+40 |
|/ / | | | | | | | * add unit test for this case | ||||
* | | Merge pull request #20875 from owncloud/remove-changepropagator | Thomas Müller | 2015-12-02 | 8 | -865/+0 |
|\ \ | | | | | | | remove old propagation logic | ||||
| * | | remove old propagation logic | Robin Appelman | 2015-12-01 | 8 | -865/+0 |
| | | | |||||
* | | | Merge pull request #20891 from owncloud/check-for-cli | Morris Jobke | 2015-12-02 | 1 | -7/+7 |
|\ \ \ | | | | | | | | | Execute only for web and not for CLI | ||||
| * | | | Execute only for web and not for CLI | Lukas Reschke | 2015-12-02 | 1 | -7/+7 |
|/ / / | |||||
* | | | Merge pull request #20889 from owncloud/fix-logout-for-bjoern | Lukas Reschke | 2015-12-02 | 2 | -1/+9 |
|\ \ \ | | | | | | | | | Ensure trailing slash in URIs | ||||
| * | | | Add a trailing slash to generated URLs | Lukas Reschke | 2015-12-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Ensure that ownCloud is always accessed with a trailing slash | Lukas Reschke | 2015-12-02 | 1 | -0/+8 |
|/ / / | |||||
* | | | Merge pull request #20884 from owncloud/fix_20713 | Thomas Müller | 2015-12-02 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Respect disabled incoming federated shares | ||||
| * | | | [Sharing] Respect disabled incoming federated shares | Roeland Jago Douma | 2015-12-02 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only fetch the incoming federated shares if incoming shares are actually enabled. Fixes #20713 | ||||
* | | | | Merge pull request #20879 from ↵ | Thomas Müller | 2015-12-02 | 3 | -15/+21 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/check-if-rewrite-base-is-set-if-rewrite-is-active Check if rewrite base is set if rewrite is active | ||||
| * | | | | fix indentation | Morris Jobke | 2015-12-02 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Set RewriteBase to / if OC::WEBROOT is not set | Lukas Reschke | 2015-12-01 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Append PATH_INFO to ensure that file can be loaded on update | Lukas Reschke | 2015-12-01 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | Disable MultiView + DirectorySlash | Lukas Reschke | 2015-12-01 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | Required for routes that might otherwise collide with existing folders on the system | ||||
| * | | | | Set "SetEnv" within base `.htaccess` file | Lukas Reschke | 2015-12-01 | 3 | -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-test | Thomas Müller | 2015-12-02 | 5 | -5/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | Add quota behat test | ||||
| * | | | | | fix code style | Morris Jobke | 2015-12-01 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | add parameter to call single behat tests | Morris Jobke | 2015-12-01 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | add behat tests for 0 quota upload failure | Morris Jobke | 2015-12-01 | 4 | -2/+44 |
| | | | | | | |||||
* | | | | | | Merge pull request #20865 from owncloud/post-delete-meta | Thomas Müller | 2015-12-02 | 6 | -23/+108 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add metadata to post delete hooks | ||||
| * | | | | | | Add metadata to post delete hooks | Robin Appelman | 2015-12-01 | 6 | -23/+108 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #20874 from owncloud/allow-di-mimetypedetector | Thomas Müller | 2015-12-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Allow DI for OCP\Files\IMimeTypeDetector | ||||
| * | | | | | | | Allow DI for OCP\Files\IMimeTypeDetector | Joas Schilling | 2015-12-01 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #20877 from owncloud/fix-empty-expirationDate | Thomas Müller | 2015-12-02 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Check the expiration date for null | ||||
| * | | | | | | | Check the expiration date for null | Morris Jobke | 2015-12-01 | 1 | -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 transifex | Jenkins for ownCloud | 2015-12-02 | 12 | -10/+36 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #20883 from owncloud/avatar_di | Roeland Douma | 2015-12-02 | 7 | -126/+266 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | DI in avatar code | ||||
| * | | | | | DI in avatar code | Roeland Jago Douma | 2015-12-01 | 7 | -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-urls | Lukas Reschke | 2015-12-01 | 9 | -5/+61 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Support pretty URLs |