Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinking | Lukas Reschke | 2014-08-19 | 2 | -0/+16 |
|\ | |||||
| * | Add a copied_sample_config switch | Lukas Reschke | 2014-08-19 | 2 | -0/+16 |
* | | 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 | 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 |
|\ \ \ | |||||
| * | | | 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, getUser should always return false during public u... | Bjoern Schiessle | 2014-08-18 | 1 | -1/+3 |
* | | | | | Merge pull request #10341 from owncloud/issue/9928 | Thomas Müller | 2014-08-19 | 1 | -5/+10 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
| * | | | | | 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 | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
| * | | | | | | | Use global apps slide toggle logic | Vincent Petry | 2014-08-12 | 2 | -26/+2 |
| * | | | | | | | 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 | 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 | 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 | Joas Schilling | 2014-08-18 | 2 | -7/+27 |
* | | | | | | | | Merge pull request #10488 from owncloud/upgrade-clinotice | Morris Jobke | 2014-08-18 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | 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 | 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 | Joas Schilling | 2014-08-04 | 1 | -5/+8 |
* | | | | | | | | [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. | 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 | 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 | 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 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | |