summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10340 from owncloud/fix-9887blizzz2014-08-186-2/+124
|\
| * unify testsArthur Schiwon2014-08-181-55/+36
| * adjust login test to code changesArthur Schiwon2014-08-121-0/+5
| * better check whether string resembles a DN, fixes #9887Arthur Schiwon2014-08-115-2/+138
* | Merge pull request #10339 from owncloud/users-defaultquotafixVincent Petry2014-08-185-122/+139
|\ \
| * | Do not close container/slider when clicking on single select fieldVincent Petry2014-08-151-0/+4
| * | it does not affect gravity on planet earth, but only for tipsyArthur Schiwon2014-08-132-2/+2
| * | make singleselect check for gravity wish, and make it south for default quotaArthur Schiwon2014-08-122-2/+6
| * | Replaced spaces with tabs in apps.jsVincent Petry2014-08-121-54/+54
| * | Fix default quota settings fieldVincent Petry2014-08-121-30/+52
| * | Use global apps slide toggle logicVincent Petry2014-08-122-26/+2
| * | Trigger events when app-settings visibility changesVincent Petry2014-08-121-4/+15
* | | Merge pull request #10493 from owncloud/design-warning-linkMorris Jobke2014-08-181-0/+1
|\ \ \
| * | | fix color of links in warnings, fix #10480Jan-Christoph Borchardt2014-08-181-0/+1
* | | | Merge pull request #10491 from helix84/fix-typoClark Tomlinson2014-08-181-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fix typo in util.phphelix842014-08-181-1/+1
* | | | Merge pull request #10478 from owncloud/issue/9995Joas Schilling2014-08-182-7/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Add a note about overwritewebroot when using system cronJoas Schilling2014-08-182-7/+27
* | | | Merge pull request #10488 from owncloud/upgrade-clinoticeMorris Jobke2014-08-181-0/+4
|\ \ \ \
| * | | | Added upgrade notice to avoid timeoutsVincent Petry2014-08-181-0/+4
|/ / / /
* | | | Merge pull request #10472 from owncloud/fix_undefined_index_ocsidThomas Müller2014-08-181-1/+2
|\ \ \ \
| * | | | check if array index ocsid is set before accessing itGeorg Ehrke2014-08-171-1/+2
* | | | | Merge pull request #10156 from owncloud/issue/9968Thomas Müller2014-08-181-5/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Check return of fopen() before using itJoas Schilling2014-08-041-5/+8
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-18502-3524/+3572
* | | | | Merge pull request #10456 from kroimon/skeleton_dir_configFrank Karlitschek2014-08-172-1/+9
|\ \ \ \ \
| * | | | | Make skeleton directory configurable.Stefan Rado2014-08-162-1/+9
* | | | | | Merge pull request #10471 from owncloud/fix-db-mapper-updateMorris Jobke2014-08-181-1/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | according to PHPDoc this function shall return the entityThomas Müller2014-08-171-1/+4
|/ / / / /
* | | | | Merge pull request #10469 from owncloud/remove-xmailer-headerThomas Müller2014-08-171-0/+1
|\ \ \ \ \
| * | | | | Remove X-Mailer header from mailsLukas Reschke2014-08-171-0/+1
* | | | | | Merge pull request #10407 from owncloud/rm-obsolete-japaneseLukas Reschke2014-08-1711-772/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | remove obsolete japanese lang codeVolkan Gezer2014-08-1311-772/+0
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-17498-1153/+1314
* | | | | | Merge pull request #10276 from owncloud/skip-webdavputLukas Reschke2014-08-161-1/+1
|\ \ \ \ \ \
| * | | | | | login as user1 before performing a testBjoern Schiessle2014-08-151-1/+1
* | | | | | | Merge pull request #10447 from owncloud/share-foldericonfixMorris Jobke2014-08-164-18/+77
|\ \ \ \ \ \ \
| * | | | | | | Fixed folder icon update routine when share owner existsVincent Petry2014-08-154-18/+77
| |/ / / / / /
* | | / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-08-16611-4610/+4741
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #10413 from owncloud/adding-handlebarsLukas Reschke2014-08-151-0/+2746
|\ \ \ \ \ \
| * | | | | | Adding handlebars.jsThomas Müller2014-08-141-0/+2746
* | | | | | | Merge pull request #10449 from owncloud/share-clientsidesortnoservercallLukas Reschke2014-08-152-5/+23
|\ \ \ \ \ \ \
| * | | | | | | Client side sort for sharing overviewVincent Petry2014-08-152-5/+23
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #10452 from owncloud/bettersslThomas Müller2014-08-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | ssl capitalVolkan Gezer2014-08-151-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #10442 from owncloud/move-failed-loginsLukas Reschke2014-08-153-10/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix unit testLukas Reschke2014-08-151-1/+4
| * | | | | | Move authentication failed logging to checkPasswordLukas Reschke2014-08-153-10/+2
* | | | | | | Merge pull request #10440 from owncloud/enforce-debugClark Tomlinson2014-08-151-7/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove ability to trigger DEBUG mode via cookieLukas Reschke2014-08-151-7/+0
| |/ / / / / /