aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinkingLukas Reschke2014-08-192-0/+16
|\
| * Add a copied_sample_config switchLukas Reschke2014-08-192-0/+16
* | Merge pull request #10500 from owncloud/fix_userlist_settings_ajaxMorris Jobke2014-08-191-3/+3
|\ \
| * | properly encode groups as json, not ',' separatedJörn Friedrich Dreyer2014-08-181-3/+3
* | | Merge pull request #10425 from owncloud/set_default_share_folderBjörn Schießle2014-08-198-4/+123
|\ \ \
| * | | Fix copyrightLukas Reschke2014-08-181-1/+1
| * | | fix broken unit testsBjoern Schiessle2014-08-181-3/+5
| * | | update unit tests with configurable share folderBjoern Schiessle2014-08-183-0/+76
| * | | make share folder configurableBjoern Schiessle2014-08-184-1/+42
* | | | Merge pull request #10494 from owncloud/fix_upload_to_public_folderBjörn Schießle2014-08-191-1/+3
|\ \ \ \
| * | | | set incognitoMode to true, getUser should always return false during public u...Bjoern Schiessle2014-08-181-1/+3
* | | | | Merge pull request #10341 from owncloud/issue/9928Thomas Müller2014-08-191-5/+10
|\ \ \ \ \
| * | | | | Ensure that filename is prefixed with a slashJoas Schilling2014-08-141-0/+1
| * | | | | Do not filemtime() on "." directory. Use empty string insteadJoas Schilling2014-08-111-0/+5
| * | | | | Remove doubled slash between folder and pathJoas Schilling2014-08-111-5/+4
* | | | | | Merge pull request #10492 from owncloud/hidesharesectionswhendisabledMorris Jobke2014-08-191-14/+18
|\ \ \ \ \ \
| * | | | | | Hide sharing sections in files app when sharing API is disabledVincent Petry2014-08-181-14/+18
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-19636-13982/+16223
| |_|_|_|/ / |/| | | | |
* | | | | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |