aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make search results work on mobile as wellJan-Christoph Borchardt2014-04-091-6/+9
* Merge pull request #7837 from owncloud/fix_7530blizzz2014-04-092-7/+237
|\
| * add comment to clearify when a skip in the foreach happensArthur Schiwon2014-04-091-0/+1
| * define varArthur Schiwon2014-03-211-0/+1
| * make tests work on systems without php5_ldapArthur Schiwon2014-03-211-0/+12
| * add tests for cumulativeSearchOnAttributeArthur Schiwon2014-03-211-0/+198
| * fix potential infinite loop when the DN of the first entry was already read.Arthur Schiwon2014-03-201-1/+1
| * Use the LDAP wrapper for checking resources, needs for proper testingArthur Schiwon2014-03-201-1/+1
| * Fix wildcard handling and check even less DNs per filter, enough will be look...Arthur Schiwon2014-03-201-4/+7
| * LDAP Wizard: when determining objectclasses, we realy do not need to look at ...Arthur Schiwon2014-03-201-4/+19
* | Merge pull request #8122 from owncloud/issue/8048Joas Schilling2014-04-091-3/+1
|\ \
| * | Always define sendmail_is_availableJoas Schilling2014-04-091-3/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-09365-3687/+6474
* | Merge pull request #8117 from owncloud/fix-hard-coded-uman-strThomas Müller2014-04-081-5/+6
|\ \
| * | Make hardcoded exception messages translatableVolkan Gezer2014-04-081-5/+6
* | | Merge pull request #7643 from owncloud/chainable_responseThomas Müller2014-04-086-0/+62
|\ \ \
| * | | Add @return PHPDocsThomas Tanghus2014-03-103-0/+7
| * | | Chainable Response in AppFrameworkThomas Tanghus2014-03-096-0/+55
* | | | Merge pull request #8111 from owncloud/trash-disablesharingVincent Petry2014-04-081-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Disable sharing in trashbin appVincent Petry2014-04-081-0/+1
|/ / /
* | | Merge pull request #8110 from owncloud/fix-failing-config-unit-testThomas Müller2014-04-081-1/+1
|\ \ \
| * | | class Test_Config is already declaredThomas Müller2014-04-081-1/+1
|/ / /
* | | Merge pull request #8032 from owncloud/fs-backend-registrationThomas Müller2014-04-0810-166/+462
|\ \ \
| * | | unit tests for dynamic backend registrationThomas Müller2014-04-072-14/+141
| * | | remove duplicate method checkDependencies()Thomas Müller2014-04-031-12/+0
| * | | use command -v to detect if smbclient existsThomas Müller2014-04-031-1/+1
| * | | Merge branch 'master' into fs-backend-registrationThomas Müller2014-04-033-145/+172
| |\ \ \
| * | | | Update backends and their configurationsThomas Müller2014-04-031-19/+72
| * | | | Moved dependency checks to end of class filesPhilipp Kapfer2014-04-039-248/+296
| * | | | Added cURL dependency for Amazon S3, Dropbox and SWIFTPhilipp Kapfer2014-04-034-3/+42
| * | | | Changed dependency check messages from warnings to notesPhilipp Kapfer2014-04-035-8/+41
| * | | | Added cURL dependency check to Google Drive and WebDAV backendPhilipp Kapfer2014-04-034-4/+33
| * | | | Modified app to dynamically register backends instead of hard-coding themPhilipp Kapfer2014-04-034-158/+129
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-08248-4684/+13590
* | | | | Merge pull request #8102 from owncloud/fix-appconfig-masterThomas Müller2014-04-083-4/+41
|\ \ \ \ \
| * | | | | using array_key_exists() instead of isset() - required because in case the va...Thomas Müller2014-04-071-1/+1
| * | | | | fixing undefined exception classesThomas Müller2014-04-071-3/+3
| * | | | | unit test testSetAppValueIfSetToNull() addedThomas Müller2014-04-071-0/+37
* | | | | | Merge pull request #8089 from bantu/autotest-checkout-pathspecJörn Friedrich Dreyer2014-04-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use git checkout on directory as some files may not be in git resulting in, e...Andreas Fischer2014-04-071-1/+1
* | | | | | Merge pull request #8065 from owncloud/avatar-highdpiThomas Müller2014-04-071-3/+3
|\ \ \ \ \ \
| * | | | | | use high resolution avatars on highdpi screensRobin Appelman2014-04-041-3/+3
* | | | | | | Merge pull request #8091 from owncloud/jshint-globals-oc-t-nJörn Friedrich Dreyer2014-04-072-1/+5
|\ \ \ \ \ \ \
| * | | | | | | ignore underscore.js in scrutinizer.ymlThomas Müller2014-04-071-0/+1
| * | | | | | | Merge branch 'master' into jshint-globals-oc-t-nThomas Müller2014-04-079-69/+1424
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #8088 from owncloud/fix-personal.jsThomas Müller2014-04-075-52/+1396
|\ \ \ \ \ \ \ \
| * | | | | | | | adding underscore.jsThomas Müller2014-04-071-0/+1344
| * | | | | | | | reduce code duplication, fix parse error, prevent page reload on hitting ente...Thomas Müller2014-04-074-52/+52
* | | | | | | | | Merge pull request #7599 from owncloud/public-pathinfoicewind19912014-04-071-6/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow using pathinfo based public.php pathsRobin Appelman2014-03-061-6/+14