Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 | ||||
| * | | | | Added upgrade notice to avoid timeouts | Vincent Petry | 2014-08-18 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Merge pull request #10472 from owncloud/fix_undefined_index_ocsid | Thomas Müller | 2014-08-18 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | check if array index ocsid is set before accessing it | ||||
| * | | | | check if array index ocsid is set before accessing it | Georg Ehrke | 2014-08-17 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge pull request #10156 from owncloud/issue/9968 | Thomas Müller | 2014-08-18 | 1 | -5/+8 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Check return of fopen() before using it | ||||
| * | | | | Check return of fopen() before using it | Joas Schilling | 2014-08-04 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | Fix #9968 | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-18 | 502 | -3524/+3572 |
| | | | | | |||||
* | | | | | Merge pull request #10456 from kroimon/skeleton_dir_config | Frank Karlitschek | 2014-08-17 | 2 | -1/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Make skeleton directory configurable. | ||||
| * | | | | | Make skeleton directory configurable. | Stefan Rado | 2014-08-16 | 2 | -1/+9 |
| | | | | | | |||||
* | | | | | | Merge pull request #10471 from owncloud/fix-db-mapper-update | Morris Jobke | 2014-08-18 | 1 | -1/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | according to PHPDoc this function shall return the entity | ||||
| * | | | | | according to PHPDoc this function shall return the entity | Thomas Müller | 2014-08-17 | 1 | -1/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #10469 from owncloud/remove-xmailer-header | Thomas Müller | 2014-08-17 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove X-Mailer header from mails | ||||
| * | | | | | Remove X-Mailer header from mails | Lukas Reschke | 2014-08-17 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #10407 from owncloud/rm-obsolete-japanese | Lukas Reschke | 2014-08-17 | 11 | -772/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | remove obsolete japanese lang code | ||||
| * | | | | | remove obsolete japanese lang code | Volkan Gezer | 2014-08-13 | 11 | -772/+0 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-17 | 498 | -1153/+1314 |
| | | | | | | |||||
* | | | | | | Merge pull request #10276 from owncloud/skip-webdavput | Lukas Reschke | 2014-08-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | skip WebdavTest of encryption | ||||
| * | | | | | | login as user1 before performing a test | Bjoern Schiessle | 2014-08-15 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #10447 from owncloud/share-foldericonfix | Morris Jobke | 2014-08-16 | 4 | -18/+77 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed folder icon update routine when share owner exists | ||||
| * | | | | | | | Fixed folder icon update routine when share owner exists | Vincent Petry | 2014-08-15 | 4 | -18/+77 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a folder has a "data-share-owner" attribute, the icon is now properly updated to a shared folder icon. | ||||
* | | / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-16 | 611 | -4610/+4741 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #10413 from owncloud/adding-handlebars | Lukas Reschke | 2014-08-15 | 1 | -0/+2746 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding handlebars.js | ||||
| * | | | | | | Adding handlebars.js | Thomas Müller | 2014-08-14 | 1 | -0/+2746 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #10449 from owncloud/share-clientsidesortnoservercall | Lukas Reschke | 2014-08-15 | 2 | -5/+23 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Client side sort for sharing overview | ||||
| * | | | | | | | Client side sort for sharing overview | Vincent Petry | 2014-08-15 | 2 | -5/+23 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Since the server doesn't support sorting, use client side sort directly instead of calling reload() first. | ||||
* | | | | | | | Merge pull request #10452 from owncloud/betterssl | Thomas Müller | 2014-08-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | We'd better use SSL in capital | ||||
| * | | | | | | | ssl capital | Volkan Gezer | 2014-08-15 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #10442 from owncloud/move-failed-logins | Lukas Reschke | 2014-08-15 | 3 | -10/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Move authentication failed logging to checkPassword | ||||
| * | | | | | | Fix unit test | Lukas Reschke | 2014-08-15 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Move authentication failed logging to checkPassword | Lukas Reschke | 2014-08-15 | 3 | -10/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10366 | ||||
* | | | | | | | Merge pull request #10440 from owncloud/enforce-debug | Clark Tomlinson | 2014-08-15 | 1 | -7/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove ability to trigger DEBUG mode via cookie |