Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContent | Thomas Müller | 2015-12-07 | 2 | -19/+12 |
|\ | |||||
| * | Remove OC_Util::getUrlContent and replace by proper usage of public interfaces | Morris Jobke | 2015-12-04 | 2 | -19/+12 |
* | | Merge pull request #11131 from owncloud/use-phpini-wrapper | Thomas Müller | 2015-12-07 | 7 | -14/+16 |
|\ \ | |||||
| * | | Replace new occurences of ini_get with IniWrapper methods | Morris Jobke | 2015-11-23 | 4 | -7/+9 |
| * | | Replacing ini_get instances with inigetwrapper usages | Clark Tomlinson | 2015-11-23 | 5 | -7/+7 |
* | | | Merge pull request #20904 from owncloud/view-mime-filter | Thomas Müller | 2015-12-07 | 1 | -6/+2 |
|\ \ \ | |||||
| * | | | Fix mimetype filter in getDirectoryContent | Robin Appelman | 2015-12-03 | 1 | -6/+2 |
* | | | | Merge pull request #20949 from owncloud/fix_20892 | Thomas Müller | 2015-12-07 | 1 | -4/+2 |
|\ \ \ \ | |||||
| * | | | | [Sharing] Properly check if a group already has access | Roeland Jago Douma | 2015-12-04 | 1 | -4/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #20957 from owncloud/use-correct-method-signature | Thomas Müller | 2015-12-07 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use correct method signature | Lukas Reschke | 2015-12-04 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntry | Thomas Müller | 2015-12-07 | 2 | -32/+2 |
|\ \ \ \ | |||||
| * | | | | remove OC_App::getActiveNavigationEntry - not unsed anymore | Morris Jobke | 2015-12-04 | 1 | -14/+0 |
| * | | | | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App | Morris Jobke | 2015-12-04 | 2 | -18/+2 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-07 | 2 | -0/+6 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-06 | 4 | -2/+14 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-05 | 8 | -8/+40 |
|/ / / | |||||
* | | | 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 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-04 | 2 | -0/+2 |
* | | | | 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 |
* | | | | | Merge pull request #20545 from owncloud/scan-storage-in-background-job | Thomas Müller | 2015-12-03 | 1 | -1/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Move files/ajax/scan.php to background job | Lukas Reschke | 2015-11-28 | 1 | -1/+0 |
* | | | | | Merge pull request #20924 from owncloud/use-url-generator-to-generate-link | Thomas Müller | 2015-12-03 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Use URLGenerator instead of hard-coded WEBROOT | Lukas Reschke | 2015-12-03 | 1 | -2/+2 |
* | | | | | | 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 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Fix code from comments | Jesús Macias | 2015-12-03 | 4 | -27/+15 |
* | | | | | | Migrate storate status code to storagenotavailablexception | Jesús Macias | 2015-12-03 | 1 | -0/+3 |
* | | | | | | Fix code from PR comments | Jesús Macias | 2015-12-03 | 5 | -8/+13 |
* | | | | | | Add new external storage exceptions for different errors | Jesús Macias | 2015-12-03 | 4 | -0/+177 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #20872 from owncloud/systemtags-better-not-found-exception | Thomas Müller | 2015-12-03 | 4 | -8/+46 |
|\ \ \ \ \ | |||||
| * | | | | | Add a method to get the list of tags from the TagNotFound Exception | Joas Schilling | 2015-12-01 | 4 | -8/+46 |
* | | | | | | 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 | 4 | -27/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Adding unit test for MailNotifications::sendInternalShareMail() | Thomas Müller | 2015-12-02 | 2 | -6/+6 |
| * | | | | | | | 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 | 5 | -32/+130 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | 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 | 2 | -4/+37 |
| * | | | | | | Add the user's cloud id to the vCard | Thomas Müller | 2015-12-02 | 2 | -25/+50 |
| * | | | | | | Add IUser::getAvatarImage() for easy access | Thomas Müller | 2015-12-02 | 3 | -2/+39 |
* | | | | | | | Reduce OC_Config usage in lib/ | Morris Jobke | 2015-12-02 | 4 | -8/+10 |
| |/ / / / / |/| | | | | |