summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix numeric storage id for cache wrapperVincent Petry2014-12-102-0/+13
* Merge pull request #12711 from owncloud/add-backend-to-rest-indexLukas Reschke2014-12-107-89/+155
|\
| * Make class compatibleLukas Reschke2014-12-091-0/+3
| * Expose backend type via REST APILukas Reschke2014-12-096-89/+152
* | Merge pull request #12737 from owncloud/fix-missing-nl-phpstormThomas Müller2014-12-101-1/+2
|\ \
| * | Add newline that was removed by 15be763d46d56c57d4f0def7745bb02d513e3a38Joas Schilling2014-12-101-1/+2
|/ /
* | Merge pull request #12090 from AdamWill/google-rename-deleteMorris Jobke2014-12-101-0/+12
|\ \
| * | google: delete original after successful renameAdam Williamson2014-11-301-0/+12
* | | Merge pull request #12549 from owncloud/shared-cache-non-existingMorris Jobke2014-12-101-10/+12
|\ \ \
| * | | Dont return cached date in shared cache when the file doesn't existRobin Appelman2014-12-021-10/+12
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-10286-78/+430
* | | | Merge pull request #12664 from owncloud/fix-12164Thomas Müller2014-12-105-35/+119
|\ \ \ \
| * | | | Remove leftoverVictor Dubiniuk2014-12-101-1/+0
| * | | | Inject configVictor Dubiniuk2014-12-105-34/+46
| * | | | Fix tests. Add two more test casesVictor Dubiniuk2014-12-082-45/+59
| * | | | Test OC\Updater::checkVictor Dubiniuk2014-12-061-2/+58
| * | | | Use httphelper and cache response even when it emptyVictor Dubiniuk2014-12-064-23/+26
* | | | | Merge pull request #12695 from owncloud/db-drop-tableMorris Jobke2014-12-095-47/+139
|\ \ \ \ \
| * | | | | Quote identifiers for oracleRobin Appelman2014-12-091-0/+27
| * | | | | add unit tests for tableExists and dropTableRobin Appelman2014-12-091-0/+69
| * | | | | Add tableExists to public db apiRobin Appelman2014-12-093-38/+23
| * | | | | Add dropTable to IDBConnectionRobin Appelman2014-12-093-10/+21
* | | | | | Merge pull request #12724 from owncloud/fix-autotest-no-fileThomas Müller2014-12-091-1/+1
|\ \ \ \ \ \
| * | | | | | Correctly run all tests again when no file is specifiedJoas Schilling2014-12-091-1/+1
|/ / / / / /
* | | | | | Merge pull request #11214 from owncloud/issue/10836Morris Jobke2014-12-096-6/+29
|\ \ \ \ \ \
| * | | | | | Add an option to disallow sending sharing emails to non-owncloud usersJoas Schilling2014-12-096-6/+29
* | | | | | | Merge pull request #12409 from owncloud/tags-getTagsForObjectIdsJoas Schilling2014-12-093-1/+89
|\ \ \ \ \ \ \
| * | | | | | | Add getTagsForObjects in ITagsVincent Petry2014-12-083-1/+89
* | | | | | | | Merge pull request #12722 from owncloud/autocomplete-for-autotest-jenkinsThomas Müller2014-12-091-1/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Allow autocomplete for test file in autotest.shJoas Schilling2014-12-091-1/+5
* | | | | | | | Merge pull request #12568 from owncloud/autoload-encryption-classesJoas Schilling2014-12-0943-708/+685
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Correctly namespace encryption testsJoas Schilling2014-12-0912-185/+181
| * | | | | | | Use self:: instead of the class name in encryption testsJoas Schilling2014-12-0910-361/+361
| * | | | | | | Update OCA\Encryption to OCA\Files_Encryption in the encryption app itselfJoas Schilling2014-12-0934-252/+248
| * | | | | | | Fix namespace of Files_Encryption outside of the appJoas Schilling2014-12-095-7/+7
| * | | | | | | Fix namespace of files_encryption classes and autoload themJoas Schilling2014-12-0913-27/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #12651 from owncloud/add-requesttoken-to-base-templateThomas Müller2014-12-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Add requesttoken to base templateLukas Reschke2014-12-051-1/+1
* | | | | | | | Merge pull request #12672 from LEDfan/cm-per-unitThomas Müller2014-12-092-4/+213
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove config fileLEDfan2014-12-081-21/+0
| * | | | | | | | Mock interfaceLEDfan2014-12-081-30/+9
| * | | | | | | | Use PHPUnit mocksLEDfan2014-12-072-27/+51
| * | | | | | | | Add unit test for contactsmanagerLEDfan2014-12-071-0/+227
| * | | | | | | | Fix permissionsLEDfan2014-12-061-4/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #12708 from owncloud/l10nsavedThomas Müller2014-12-091-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | translated saved message in files externalVolkan Gezer2014-12-081-2/+2
* | | | | | | | | Merge pull request #12688 from owncloud/rename-altLukas Reschke2014-12-091-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | introduce alt text for rename icon - fixes #12067Morris Jobke2014-12-081-0/+1
* | | | | | | | | | Merge pull request #12715 from owncloud/fix-broken-personal-pageLukas Reschke2014-12-091-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove duplicate loaded personal.js - fixes #12674Morris Jobke2014-12-091-1/+0