Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20933 from owncloud/more-OC_Config-cleanups | Thomas Müller | 2015-12-04 | 8 | -10/+11 |
|\ | |||||
| * | More cleanups of OC_Config usage | Morris Jobke | 2015-12-03 | 8 | -10/+11 |
* | | Merge pull request #20807 from owncloud/dont-append-redirect-url-if-user-is-a... | Thomas Müller | 2015-12-03 | 7 | -37/+178 |
|\ \ | |/ |/| | |||||
| * | Show error template | Lukas Reschke | 2015-11-30 | 7 | -37/+178 |
* | | Replace OC_Config in setup | Morris Jobke | 2015-12-03 | 2 | -4/+5 |
* | | Merge pull request #19461 from owncloud/reuse_code | Thomas Müller | 2015-12-03 | 1 | -43/+38 |
|\ \ | |||||
| * | | reuse code | Individual IT Services | 2015-11-23 | 1 | -43/+38 |
* | | | Merge pull request #20872 from owncloud/systemtags-better-not-found-exception | Thomas Müller | 2015-12-03 | 2 | -6/+18 |
|\ \ \ | |||||
| * | | | Add a method to get the list of tags from the TagNotFound Exception | Joas Schilling | 2015-12-01 | 2 | -6/+18 |
* | | | | Merge pull request #20894 from owncloud/post-delete-meta-view | Thomas Müller | 2015-12-03 | 1 | -3/+16 |
|\ \ \ \ | |||||
| * | | | | Also add metadata for postDelete hooks triggered from the view | Robin Appelman | 2015-12-02 | 1 | -3/+16 |
* | | | | | Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the... | Thomas Müller | 2015-12-03 | 3 | -26/+32 |
|\ \ \ \ \ | |||||
| * | | | | | Adding unit test for MailNotifications::sendInternalShareMail() | Thomas Müller | 2015-12-02 | 1 | -5/+5 |
| * | | | | | User IUser::getEMailAddress() all over the place | Thomas Müller | 2015-12-02 | 3 | -21/+27 |
* | | | | | | Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff | Thomas Müller | 2015-12-02 | 2 | -7/+12 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Replace old config code with usage of proper APIs | Morris Jobke | 2015-12-02 | 2 | -7/+12 |
* | | | | | | Merge pull request #20719 from owncloud/adding-system-addressbook-of-users | Thomas Müller | 2015-12-02 | 3 | -32/+106 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix endless recursion | Thomas Müller | 2015-12-02 | 1 | -7/+9 |
| * | | | | | Fix comments | Thomas Müller | 2015-12-02 | 1 | -1/+1 |
| * | | | | | Fix getCloudId | Thomas Müller | 2015-12-02 | 1 | -0/+1 |
| * | | | | | Proposal: add enumeration function to IUserManager which simply calls a callb... | Thomas Müller | 2015-12-02 | 1 | -4/+30 |
| * | | | | | Add the user's cloud id to the vCard | Thomas Müller | 2015-12-02 | 1 | -25/+42 |
| * | | | | | Add IUser::getAvatarImage() for easy access | Thomas Müller | 2015-12-02 | 2 | -2/+30 |
* | | | | | | Reduce OC_Config usage in lib/ | Morris Jobke | 2015-12-02 | 3 | -6/+7 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #20875 from owncloud/remove-changepropagator | Thomas Müller | 2015-12-02 | 2 | -143/+0 |
|\ \ \ \ \ | |||||
| * | | | | | remove old propagation logic | Robin Appelman | 2015-12-01 | 2 | -143/+0 |
* | | | | | | Add a trailing slash to generated URLs | Lukas Reschke | 2015-12-02 | 1 | -1/+1 |
* | | | | | | Merge pull request #20879 from owncloud/check-if-rewrite-base-is-set-if-rewri... | Thomas Müller | 2015-12-02 | 1 | -1/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Set RewriteBase to / if OC::WEBROOT is not set | Lukas Reschke | 2015-12-01 | 1 | -1/+2 |
| * | | | | | | Set "SetEnv" within base `.htaccess` file | Lukas Reschke | 2015-12-01 | 1 | -0/+3 |
* | | | | | | | Merge pull request #20865 from owncloud/post-delete-meta | Thomas Müller | 2015-12-02 | 4 | -22/+104 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add metadata to post delete hooks | Robin Appelman | 2015-12-01 | 4 | -22/+104 |
* | | | | | | | | Merge pull request #20874 from owncloud/allow-di-mimetypedetector | Thomas Müller | 2015-12-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | Morris Jobke | 2015-12-01 | 1 | -1/+7 |
| | |_|/ / / / | |/| | | | | | |||||
* / | | | | | | DI in avatar code | Roeland Jago Douma | 2015-12-01 | 4 | -32/+68 |
|/ / / / / / | |||||
* | | / / / | Support pretty URLs | Lukas Reschke | 2015-12-01 | 4 | -3/+20 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #20285 from owncloud/add-integrity-checker | Thomas Müller | 2015-12-01 | 10 | -3/+802 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add code integrity check | Lukas Reschke | 2015-12-01 | 10 | -3/+802 |
| |/ / / | |||||
* / / / | Fix the docs of the exceptions and remove hardcoded language from the message | Joas Schilling | 2015-12-01 | 1 | -3/+1 |
|/ / / | |||||
* | | | Allow DI the system tag stuff without Application class | Joas Schilling | 2015-11-30 | 1 | -0/+8 |
* | | | Merge pull request #20650 from owncloud/systemtags-core | Thomas Müller | 2015-11-30 | 4 | -0/+609 |
|\ \ \ | |||||
| * | | | Do not count the entries when we only need to know if it is at least one | Joas Schilling | 2015-11-30 | 1 | -5/+14 |
| * | | | Fix use statements | Joas Schilling | 2015-11-30 | 3 | -21/+25 |
| * | | | Add backticks inside function to escape the column | Joas Schilling | 2015-11-30 | 1 | -1/+1 |
| * | | | Added system tags data structure and PHP side managers | Vincent Petry | 2015-11-27 | 4 | -0/+596 |
* | | | | Merge pull request #20815 from owncloud/avatar-cache-size | Thomas Müller | 2015-11-30 | 1 | -2/+7 |
|\ \ \ \ | |||||
| * | | | | cache resized avatars | Robin Appelman | 2015-11-28 | 1 | -2/+7 |
* | | | | | Merge pull request #20248 from owncloud/use-phpunit-groups-to-run-database-co... | Thomas Müller | 2015-11-30 | 2 | -0/+2 |
|\ \ \ \ \ |