summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20924 from owncloud/use-url-generator-to-generate-linkThomas Müller2015-12-031-2/+2
|\
| * Use URLGenerator instead of hard-coded WEBROOTLukas Reschke2015-12-031-2/+2
* | Merge pull request #20923 from owncloud/OC_Config-in-setupThomas Müller2015-12-032-4/+5
|\ \
| * | Replace OC_Config in setupMorris Jobke2015-12-032-4/+5
* | | Merge pull request #20921 from owncloud/last-OC_Config-removals-in-testsThomas Müller2015-12-031-8/+9
|\ \ \ | |/ / |/| |
| * | last change of OC_Config to the proper interface in tests/Morris Jobke2015-12-031-3/+4
| * | Reduce OC_Config usage in tests/Morris Jobke2015-12-031-5/+5
* | | Merge pull request #19461 from owncloud/reuse_codeThomas Müller2015-12-032-43/+129
|\ \ \ | |/ / |/| |
| * | add unit tests for OC_Util::add* methodsMorris Jobke2015-11-231-0/+91
| * | reuse codeIndividual IT Services2015-11-231-43/+38
* | | Merge pull request #20729 from owncloud/issue_20599Thomas Müller2015-12-038-13/+183
|\ \ \
| * | | Fix code from commentsJesús Macias2015-12-034-27/+15
| * | | Fix duplicate use in storage controllerJesús Macias2015-12-031-1/+0
| * | | Migrate storate status code to storagenotavailablexceptionJesús Macias2015-12-034-11/+12
| * | | Fix code from PR commentsJesús Macias2015-12-036-29/+14
| * | | Change exception catch orderJesús Macias2015-12-031-5/+5
| * | | Delete unnecessary storage status constansJesús Macias2015-12-031-4/+0
| * | | Add new external storage exceptions for different errorsJesús Macias2015-12-035-38/+201
| * | | Add different storage status codes managed by StoragedNotAvailableExceptionJesús Macias2015-12-032-4/+42
* | | | Merge pull request #20916 from owncloud/integration_test_download_public_shar...Thomas Müller2015-12-032-0/+27
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added test case about downloading by range a public shared fileSergio Bertolin2015-12-032-0/+27
* | | | Merge pull request #20914 from owncloud/drop-more-OC_Config-from-testsLukas Reschke2015-12-032-6/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Replace OC_Config in tests with IConfig callsMorris Jobke2015-12-032-6/+8
|/ / /
* | | Merge pull request #20902 from owncloud/drop-OC_Config-from-testsThomas Müller2015-12-035-35/+45
|\ \ \
| * | | Replace OC_Config in tests with IConfig callsMorris Jobke2015-12-025-35/+45
* | | | Merge pull request #20871 from owncloud/bump_doctrine_depsThomas Müller2015-12-031-0/+0
|\ \ \ \
| * | | | [3rdparty] Bump doctrine/dbal depsRoeland Jago Douma2015-12-031-0/+0
* | | | | Merge pull request #20872 from owncloud/systemtags-better-not-found-exceptionThomas Müller2015-12-036-10/+60
|\ \ \ \ \
| * | | | | Fix the unit test by running tearDown() and cleaning tags before the testJoas Schilling2015-12-012-1/+13
| * | | | | Add a method to get the list of tags from the TagNotFound ExceptionJoas Schilling2015-12-015-9/+47
* | | | | | Merge pull request #20894 from owncloud/post-delete-meta-viewThomas Müller2015-12-032-4/+37
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Also add metadata for postDelete hooks triggered from the viewRobin Appelman2015-12-022-4/+37
* | | | | | Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the...Thomas Müller2015-12-0314-249/+370
|\ \ \ \ \ \
| * | | | | | Adding unit test for MailNotifications::sendInternalShareMail()Thomas Müller2015-12-023-37/+76
| * | | | | | User IUser::getEMailAddress() all over the placeThomas Müller2015-12-0213-212/+294
* | | | | | | Merge pull request #20900 from owncloud/share-group-only-with-exact-matchThomas Müller2015-12-032-12/+41
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Only return the exact match, when it's allowedJoas Schilling2015-12-022-12/+41
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0320-8/+70
* | | | | | Merge pull request #20905 from owncloud/allow-framing-itselfThomas Müller2015-12-022-1/+10
|\ \ \ \ \ \
| * | | | | | Allow framing 'self'Lukas Reschke2015-12-022-1/+10
| |/ / / / /
* | | | | | Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuffThomas Müller2015-12-023-10/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Replace old config code with usage of proper APIsMorris Jobke2015-12-023-10/+16
| | |_|/ / | |/| | |
* | | | | Merge pull request #20719 from owncloud/adding-system-addressbook-of-usersThomas Müller2015-12-0224-75/+939
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 callb...Thomas Müller2015-12-023-24/+54
| * | | | 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