Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14068 from owncloud/autotest-external-sftp | Thomas Müller | 2015-02-24 | 3 | -4/+105 |
|\ | |||||
| * | [files_external] sftp tests | Morris Jobke | 2015-02-10 | 3 | -4/+105 |
* | | Merge pull request #13740 from owncloud/fix-12190-2 | Lukas Reschke | 2015-02-24 | 5 | -26/+85 |
|\ \ | |||||
| * | | and escape the search term | Arthur Schiwon | 2015-01-29 | 3 | -1/+5 |
| * | | :lipstick: | Arthur Schiwon | 2015-01-28 | 1 | -4/+4 |
| * | | fix counting of users in primary group | Arthur Schiwon | 2015-01-28 | 2 | -24/+69 |
| * | | inlcude AD primary group in user filter, if a group is selected. fixes #12190 | Arthur Schiwon | 2015-01-28 | 1 | -2/+12 |
* | | | Merge pull request #14400 from owncloud/fix-cron-deadlock | Lukas Reschke | 2015-02-24 | 2 | -46/+41 |
|\ \ \ | |||||
| * | | | use flock instead of just checking if there is a file to prevent deadlocks wh... | Bernhard Posselt | 2015-02-24 | 2 | -46/+41 |
|/ / / | |||||
* | | | Merge pull request #14195 from owncloud/activity-manager-performance-improvem... | Lukas Reschke | 2015-02-24 | 4 | -107/+151 |
|\ \ \ | |||||
| * | | | Fix test with the invalid filter check being added | Joas Schilling | 2015-02-13 | 1 | -43/+45 |
| * | | | Order methods to by grouped by their task | Joas Schilling | 2015-02-13 | 3 | -74/+74 |
| * | | | Check whether filter is valid, before doing stuff for it | Joas Schilling | 2015-02-13 | 1 | -1/+12 |
| * | | | Cache some values from the extensions | Joas Schilling | 2015-02-13 | 1 | -0/+31 |
* | | | | Merge pull request #14282 from owncloud/disable-non-shipped-apps-master | Thomas Müller | 2015-02-24 | 7 | -85/+115 |
|\ \ \ \ | |||||
| * | | | | print app upgrade information to console as well | Thomas Müller | 2015-02-24 | 1 | -0/+6 |
| * | | | | 3rd-party apps are only disabled in case core is upgraded | Thomas Müller | 2015-02-24 | 1 | -0/+14 |
| * | | | | shipped and 3rd-party apps of type authentication and session will remain ena... | Thomas Müller | 2015-02-24 | 1 | -3/+11 |
| * | | | | 3rd-party apps are disabled on upgrade - refs #14026 | Thomas Müller | 2015-02-24 | 7 | -85/+87 |
* | | | | | Merge pull request #14461 from owncloud/fix-code-that-never-worked | Thomas Müller | 2015-02-24 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix code that never worked | Lukas Reschke | 2015-02-24 | 1 | -1/+1 |
* | | | | | | Merge pull request #11555 from goodkiller/patch-1 | Joas Schilling | 2015-02-24 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update group.php | goodkiller | 2014-10-14 | 1 | -1/+2 |
* | | | | | | | Merge pull request #13340 from owncloud/use-http-only | Lukas Reschke | 2015-02-24 | 1 | -10/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use "HTTPOnly" for cookies when logging out | Lukas Reschke | 2015-01-14 | 1 | -10/+13 |
* | | | | | | | | Merge pull request #14459 from owncloud/fix-oracle | Lukas Reschke | 2015-02-24 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Dont break code which relies on the cursor being open after insert/update/delete | Bernhard Posselt | 2015-02-24 | 1 | -1/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #10830 from Finkregh/patch-1 | Lukas Reschke | 2015-02-24 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | add howto dump the ldap-backends' configuration | Oluf Lorenzen | 2014-09-03 | 1 | -0/+9 |
| * | | | | | | add question about user-backend | Oluf Lorenzen | 2014-09-03 | 1 | -0/+2 |
* | | | | | | | Merge pull request #10599 from owncloud/move_passwordchange_text | Lukas Reschke | 2015-02-24 | 4 | -9/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add fix for checkmark icon for IE8 | Morris Jobke | 2015-02-12 | 1 | -0/+4 |
| * | | | | | | | Make the password changed msg inline to fix #10242 | kondou | 2015-02-11 | 3 | -9/+13 |
* | | | | | | | | Merge pull request #14009 from owncloud/installing-installed-apps-is-stupid | Thomas Müller | 2015-02-24 | 4 | -105/+137 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | app store can be used with any edition | Thomas Müller | 2015-02-23 | 1 | -3/+1 |
| * | | | | | | | | don't allow installation of already installed apps - fixes #14004 | Thomas Müller | 2015-02-23 | 4 | -105/+139 |
* | | | | | | | | | Merge pull request #14419 from owncloud/preview_apostrophe_fix | Joas Schilling | 2015-02-24 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix issue with previews not being displayed if filename contains apostrophe | Georg Ehrke | 2015-02-22 | 1 | -2/+2 |
* | | | | | | | | | | Merge pull request #14442 from owncloud/fix-oracle-ci-master | Lukas Reschke | 2015-02-24 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Close the cursor after the affected count has been extracted. | Thomas Müller | 2015-02-23 | 1 | -1/+2 |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-24 | 30 | -56/+186 |
| |_|/ / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #14433 from owncloud/fix-public-php | Thomas Müller | 2015-02-23 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use `getParam` instead of `server` | Lukas Reschke | 2015-02-23 | 1 | -3/+4 |
* | | | | | | | | | | | Merge pull request #14416 from owncloud/setup-command | Thomas Müller | 2015-02-23 | 11 | -76/+223 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | properly initialize OC::$WEBROOT and host name | Thomas Müller | 2015-02-23 | 2 | -12/+17 |
| * | | | | | | | | | | | Fix error handling | Thomas Müller | 2015-02-23 | 1 | -1/+6 |
| * | | | | | | | | | | | implement command maintenance:install | Thomas Müller | 2015-02-23 | 4 | -34/+162 |
| * | | | | | | | | | | | Fix namespace of OC_Setup -> \OC\Setup | Thomas Müller | 2015-02-23 | 6 | -30/+39 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #13439 from owncloud/app-filter | Thomas Müller | 2015-02-23 | 4 | -49/+194 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Added unit test for app filter | Vincent Petry | 2015-02-23 | 4 | -57/+175 |