Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10523 from owncloud/fix-shared-multiselect | Morris Jobke | 2014-08-19 | 1 | -1/+2 |
|\ | | | | | fix multiselect bar offset on shared page | ||||
| * | fix multiselect bar offset on shared page | Jan-Christoph Borchardt | 2014-08-19 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #9866 from owncloud/app-upgrade | Robin Appelman | 2014-08-19 | 10 | -57/+132 |
|\ | | | | | Don't do app upgrades in the background | ||||
| * | fix undefined variable | Robin Appelman | 2014-08-18 | 1 | -1/+1 |
| | | |||||
| * | only set core version at the end | Robin Appelman | 2014-08-04 | 1 | -2/+0 |
| | | |||||
| * | Set maintaince mode when updating an app from the app store | Robin Appelman | 2014-08-04 | 1 | -0/+3 |
| | | |||||
| * | Also set the app version when updating from app store | Robin Appelman | 2014-08-04 | 2 | -2/+3 |
| | | |||||
| * | Send feedback from upgrading apps to the upgrade ui | Robin Appelman | 2014-08-04 | 1 | -0/+6 |
| | | |||||
| * | Allow loading app without checking the upgrade | Robin Appelman | 2014-08-04 | 1 | -4/+8 |
| | | |||||
| * | extract upgrade parts to their own methods | Robin Appelman | 2014-08-04 | 1 | -19/+62 |
| | | |||||
| * | handle service not available exceptions in index, remote and public.php | Robin Appelman | 2014-08-04 | 3 | -0/+15 |
| | | |||||
| * | Throw an exception when we try to load an app that needs to be upgraded | Robin Appelman | 2014-08-04 | 3 | -34/+28 |
| | | |||||
| * | Extend OC_Util::needUpgrade to also catch app upgrades | Robin Appelman | 2014-08-04 | 1 | -1/+12 |
| | | |||||
* | | Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinking | Lukas Reschke | 2014-08-19 | 2 | -0/+16 |
|\ \ | | | | | | | Add a copied_sample_config switch | ||||
| * | | Add a copied_sample_config switch | Lukas Reschke | 2014-08-19 | 2 | -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_ajax | Morris Jobke | 2014-08-19 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | properly encode groups as json, not ',' separated | ||||
| * | | | properly encode groups as json, not ',' separated | Jörn Friedrich Dreyer | 2014-08-18 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #10425 from owncloud/set_default_share_folder | Björn Schießle | 2014-08-19 | 8 | -4/+123 |
|\ \ \ \ | | | | | | | | | | | Set default share folder | ||||
| * | | | | Fix copyright | Lukas Reschke | 2014-08-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix broken unit tests | Bjoern Schiessle | 2014-08-18 | 1 | -3/+5 |
| | | | | | |||||
| * | | | | update unit tests with configurable share folder | Bjoern Schiessle | 2014-08-18 | 3 | -0/+76 |
| | | | | | |||||
| * | | | | make share folder configurable | Bjoern Schiessle | 2014-08-18 | 4 | -1/+42 |
| | | | | | |||||
* | | | | | Merge pull request #10494 from owncloud/fix_upload_to_public_folder | Björn Schießle | 2014-08-19 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | set incognitoMode to true during upload to a public folder | ||||
| * | | | | | set incognitoMode to true, getUser should always return false during public ↵ | Bjoern Schiessle | 2014-08-18 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | upload | ||||
* | | | | | | Merge pull request #10341 from owncloud/issue/9928 | Thomas Müller | 2014-08-19 | 1 | -5/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [Issue/9928] Problems with filemtime in MappedLocal Storage | ||||
| * | | | | | | Ensure that filename is prefixed with a slash | Joas Schilling | 2014-08-14 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Do not filemtime() on "." directory. Use empty string instead | Joas Schilling | 2014-08-11 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9928 | ||||
| * | | | | | | Remove doubled slash between folder and path | Joas Schilling | 2014-08-11 | 1 | -5/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #10492 from owncloud/hidesharesectionswhendisabled | Morris Jobke | 2014-08-19 | 1 | -14/+18 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Hide sharing sections in files app when sharing API is disabled | ||||
| * | | | | | | | Hide sharing sections in files app when sharing API is disabled | Vincent Petry | 2014-08-18 | 1 | -14/+18 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-19 | 636 | -13982/+16223 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #10340 from owncloud/fix-9887 | blizzz | 2014-08-18 | 6 | -2/+124 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | better check whether string resembles a DN, fixes #9887 | ||||
| * | | | | | | | unify tests | Arthur Schiwon | 2014-08-18 | 1 | -55/+36 |
| | | | | | | | | |||||
| * | | | | | | | adjust login test to code changes | Arthur Schiwon | 2014-08-12 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | better check whether string resembles a DN, fixes #9887 | Arthur Schiwon | 2014-08-11 | 5 | -2/+138 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #10339 from owncloud/users-defaultquotafix | Vincent Petry | 2014-08-18 | 5 | -122/+139 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed default quota field on user management page | ||||
| * | | | | | | | | Do not close container/slider when clicking on single select field | Vincent Petry | 2014-08-15 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | it does not affect gravity on planet earth, but only for tipsy | Arthur Schiwon | 2014-08-13 | 2 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | make singleselect check for gravity wish, and make it south for default quota | Arthur Schiwon | 2014-08-12 | 2 | -2/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Replaced spaces with tabs in apps.js | Vincent Petry | 2014-08-12 | 1 | -54/+54 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix default quota settings field | Vincent Petry | 2014-08-12 | 1 | -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 logic | Vincent Petry | 2014-08-12 | 2 | -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 changes | Vincent Petry | 2014-08-12 | 1 | -4/+15 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #10493 from owncloud/design-warning-link | Morris Jobke | 2014-08-18 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fix color of links in warnings, fix #10480 | ||||
| * | | | | | | | | | fix color of links in warnings, fix #10480 | Jan-Christoph Borchardt | 2014-08-18 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #10491 from helix84/fix-typo | Clark Tomlinson | 2014-08-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | fix typo in util.php | ||||
| * | | | | | | | | | fix typo in util.php | helix84 | 2014-08-18 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #10478 from owncloud/issue/9995 | Joas Schilling | 2014-08-18 | 2 | -7/+27 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Add a note about overwritewebroot when using system cron | ||||
| * | | | | | | | | Add a note about overwritewebroot when using system cron | Joas Schilling | 2014-08-18 | 2 | -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-clinotice | Morris Jobke | 2014-08-18 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | Added upgrade notice to avoid timeouts |