summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10523 from owncloud/fix-shared-multiselectMorris Jobke2014-08-191-1/+2
|\ | | | | fix multiselect bar offset on shared page
| * fix multiselect bar offset on shared pageJan-Christoph Borchardt2014-08-191-1/+2
|/
* Merge pull request #9866 from owncloud/app-upgradeRobin Appelman2014-08-1910-57/+132
|\ | | | | Don't do app upgrades in the background
| * fix undefined variableRobin Appelman2014-08-181-1/+1
| |
| * only set core version at the endRobin Appelman2014-08-041-2/+0
| |
| * Set maintaince mode when updating an app from the app storeRobin Appelman2014-08-041-0/+3
| |
| * Also set the app version when updating from app storeRobin Appelman2014-08-042-2/+3
| |
| * Send feedback from upgrading apps to the upgrade uiRobin Appelman2014-08-041-0/+6
| |
| * Allow loading app without checking the upgradeRobin Appelman2014-08-041-4/+8
| |
| * extract upgrade parts to their own methodsRobin Appelman2014-08-041-19/+62
| |
| * handle service not available exceptions in index, remote and public.phpRobin Appelman2014-08-043-0/+15
| |
| * Throw an exception when we try to load an app that needs to be upgradedRobin Appelman2014-08-043-34/+28
| |
| * Extend OC_Util::needUpgrade to also catch app upgradesRobin Appelman2014-08-041-1/+12
| |
* | Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinkingLukas Reschke2014-08-192-0/+16
|\ \ | | | | | | Add a copied_sample_config switch
| * | Add a copied_sample_config switchLukas Reschke2014-08-192-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Hopefully this will stop people from copying the sample config. I'm so annoyed by all those wrong bug reports... Add some explanation about this switch Move check to init
* | | Merge pull request #10500 from owncloud/fix_userlist_settings_ajaxMorris Jobke2014-08-191-3/+3
|\ \ \ | | | | | | | | properly encode groups as json, not ',' separated
| * | | 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
|\ \ \ \ | | | | | | | | | | Set default share folder
| * | | | 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 during upload to a public folder
| * | | | | set incognitoMode to true, getUser should always return false during public ↵Bjoern Schiessle2014-08-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | upload
* | | | | | Merge pull request #10341 from owncloud/issue/9928Thomas Müller2014-08-191-5/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | [Issue/9928] Problems with filemtime in MappedLocal Storage
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9928
| * | | | | | 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 disabled
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | better check whether string resembles a DN, fixes #9887
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed default quota field on user management page
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default quota settings field is initially hidden which makes it impossible for singleSelect() to make its width measurements. This fix uses the app navigation slide "show" event to defer the singleSelect() initialization on the default quota field. Refactored setQuota() into UserList._updateQuota(). Refactored duplicate event handler code into UserList.onQuotaSelect().
| * | | | | | | | Use global apps slide toggle logicVincent Petry2014-08-122-26/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove local app settings slide logic and make it use the global one triggered by the "data-apps-slide-toggle" attribute.
| * | | | | | | | 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 #10480
| * | | | | | | | | 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.php
| * | | | | | | | | 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 cron
| * | | | | | | | Add a note about overwritewebroot when using system cronJoas Schilling2014-08-182-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the current webroot is non-empty but the webroot from the config is, and system cron is used, the URL generator fails to build valid URLs. So we notify the admin to set it up correctly. Fix #9995
* | | | | | | | | Merge pull request #10488 from owncloud/upgrade-clinoticeMorris Jobke2014-08-181-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Added upgrade notice to avoid timeouts