aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14068 from owncloud/autotest-external-sftpThomas Müller2015-02-243-4/+105
|\ | | | | [files_external] sftp tests
| * [files_external] sftp testsMorris Jobke2015-02-103-4/+105
| |
* | Merge pull request #13740 from owncloud/fix-12190-2Lukas Reschke2015-02-245-26/+85
|\ \ | | | | | | Include primary groups in user and login filter when restricting group access and also fix user counting in primary groups
| * | and escape the search termArthur Schiwon2015-01-293-1/+5
| | |
| * | :lipstick:Arthur Schiwon2015-01-281-4/+4
| | |
| * | fix counting of users in primary groupArthur Schiwon2015-01-282-24/+69
| | |
| * | inlcude AD primary group in user filter, if a group is selected. fixes #12190Arthur Schiwon2015-01-281-2/+12
| | |
* | | Merge pull request #14400 from owncloud/fix-cron-deadlockLukas Reschke2015-02-242-46/+41
|\ \ \ | | | | | | | | Use flock instead of just checking if there is a file to prevent deadloc...
| * | | use flock instead of just checking if there is a file to prevent deadlocks ↵Bernhard Posselt2015-02-242-46/+41
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the process crashed or the unlink wasnt done move cron.lock into top directory to prevent external storage issues use tmp directory lock file use new config interface incorporate #13770 add dots
* | | Merge pull request #14195 from ↵Lukas Reschke2015-02-244-107/+151
|\ \ \ | | | | | | | | | | | | | | | | owncloud/activity-manager-performance-improvements Activity manager performance improvements
| * | | Fix test with the invalid filter check being addedJoas Schilling2015-02-131-43/+45
| | | |
| * | | Order methods to by grouped by their taskJoas Schilling2015-02-133-74/+74
| | | |
| * | | Check whether filter is valid, before doing stuff for itJoas Schilling2015-02-131-1/+12
| | | |
| * | | Cache some values from the extensionsJoas Schilling2015-02-131-0/+31
| | | |
* | | | Merge pull request #14282 from owncloud/disable-non-shipped-apps-masterThomas Müller2015-02-247-85/+115
|\ \ \ \ | | | | | | | | | | 3rd-party apps are disabled on upgrade
| * | | | print app upgrade information to console as wellThomas Müller2015-02-241-0/+6
| | | | |
| * | | | 3rd-party apps are only disabled in case core is upgradedThomas Müller2015-02-241-0/+14
| | | | |
| * | | | shipped and 3rd-party apps of type authentication and session will remain ↵Thomas Müller2015-02-241-3/+11
| | | | | | | | | | | | | | | | | | | | enabled during update
| * | | | 3rd-party apps are disabled on upgrade - refs #14026Thomas Müller2015-02-247-85/+87
| | | | |
* | | | | Merge pull request #14461 from owncloud/fix-code-that-never-workedThomas Müller2015-02-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix code that never worked
| * | | | | Fix code that never workedLukas Reschke2015-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Introduced with https://github.com/owncloud/core/commit/1df8a5a774ae5d665849daf74540d967826d5e11 in February 2013…
* | | | | | Merge pull request #11555 from goodkiller/patch-1Joas Schilling2015-02-241-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update group.php
| * | | | | | Update group.phpgoodkiller2014-10-141-1/+2
| | | | | | | | | | | | | | | | | | | | | Here is fox for my LDAP users OW 7.0.2
* | | | | | | Merge pull request #13340 from owncloud/use-http-onlyLukas Reschke2015-02-241-10/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use "HTTPOnly" for cookies when logging out
| * | | | | | | Use "HTTPOnly" for cookies when logging outLukas Reschke2015-01-141-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has no other reason than preventing some insane automated scanners from reporting this as security bug (which it obviously isn't as the cookie contains nothing of value) Thus it generally results in an happier Lukas and hopefully less reports to our support and security mail addresses...
* | | | | | | | Merge pull request #14459 from owncloud/fix-oracleLukas Reschke2015-02-241-1/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Dont break code which relies on the cursor being open after insert/updat...
| * | | | | | | Dont break code which relies on the cursor being open after insert/update/deleteBernhard Posselt2015-02-241-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #10830 from Finkregh/patch-1Lukas Reschke2015-02-241-0/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | add question about user-backend
| * | | | | | add howto dump the ldap-backends' configurationOluf Lorenzen2014-09-031-0/+9
| | | | | | |
| * | | | | | add question about user-backendOluf Lorenzen2014-09-031-0/+2
| | | | | | |
* | | | | | | Merge pull request #10599 from owncloud/move_passwordchange_textLukas Reschke2015-02-244-9/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make the password changed msg inline to fix #10242
| * | | | | | | add fix for checkmark icon for IE8Morris Jobke2015-02-121-0/+4
| | | | | | | |
| * | | | | | | Make the password changed msg inline to fix #10242kondou2015-02-113-9/+13
| | | | | | | |
* | | | | | | | Merge pull request #14009 from owncloud/installing-installed-apps-is-stupidThomas Müller2015-02-244-105/+137
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | don't allow installation of already installed apps - fixes #14004
| * | | | | | | | app store can be used with any editionThomas Müller2015-02-231-3/+1
| | | | | | | | |
| * | | | | | | | don't allow installation of already installed apps - fixes #14004Thomas Müller2015-02-234-105/+139
| | | | | | | | |
* | | | | | | | | Merge pull request #14419 from owncloud/preview_apostrophe_fixJoas Schilling2015-02-241-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix issue with previews not being displayed if filename contains apostrophe
| * | | | | | | | | fix issue with previews not being displayed if filename contains apostropheGeorg Ehrke2015-02-221-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #14442 from owncloud/fix-oracle-ci-masterLukas Reschke2015-02-241-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Close the cursor after the affected count has been extracted.
| * | | | | | | | | | Close the cursor after the affected count has been extracted.Thomas Müller2015-02-231-1/+2
| | | | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2430-56/+186
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #14433 from owncloud/fix-public-phpThomas Müller2015-02-231-3/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use `getParam` instead of `server`
| * | | | | | | | | | Use `getParam` instead of `server`Lukas Reschke2015-02-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `server` is completely wrong here and this will not work on master. With `getParam` it will work fine though. Testplan: - [ ] Without patch: Share a file and try to access `http://localhost/public.php?service=files&t=THESHAREDTOKEN` => Fails - [ ] With patch: Try the same => Works Master only.
* | | | | | | | | | | Merge pull request #14416 from owncloud/setup-commandThomas Müller2015-02-2311-76/+223
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Setup command
| * | | | | | | | | | | properly initialize OC::$WEBROOT and host nameThomas Müller2015-02-232-12/+17
| | | | | | | | | | | |
| * | | | | | | | | | | Fix error handlingThomas Müller2015-02-231-1/+6
| | | | | | | | | | | |
| * | | | | | | | | | | implement command maintenance:installThomas Müller2015-02-234-34/+162
| | | | | | | | | | | |
| * | | | | | | | | | | Fix namespace of OC_Setup -> \OC\SetupThomas Müller2015-02-236-30/+39
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #13439 from owncloud/app-filterThomas Müller2015-02-234-49/+194
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make the search box filter apps
| * | | | | | | | | | | Added unit test for app filterVincent Petry2015-02-234-57/+175
| | | | | | | | | | | |