summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #14068 from owncloud/autotest-external-sftpThomas Müller2015-02-243-4/+105
|\ \ \ \ \ \ \
| * | | | | | | [files_external] sftp testsMorris Jobke2015-02-103-4/+105
* | | | | | | | Merge pull request #13740 from owncloud/fix-12190-2Lukas Reschke2015-02-245-26/+85
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 deadlocks wh...Bernhard Posselt2015-02-242-46/+41
|/ / / / / / / /
* | | | | | | | Merge pull request #14195 from owncloud/activity-manager-performance-improvem...Lukas Reschke2015-02-244-107/+151
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 ena...Thomas Müller2015-02-241-3/+11
| * | | | | | | | | 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 workedLukas Reschke2015-02-241-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #11555 from goodkiller/patch-1Joas Schilling2015-02-241-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update group.phpgoodkiller2014-10-141-1/+2
* | | | | | | | | | | Merge pull request #13340 from owncloud/use-http-onlyLukas Reschke2015-02-241-10/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use "HTTPOnly" for cookies when logging outLukas Reschke2015-01-141-10/+13
* | | | | | | | | | | | 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/update/deleteBernhard Posselt2015-02-241-1/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #10830 from Finkregh/patch-1Lukas Reschke2015-02-241-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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 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.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`Lukas Reschke2015-02-231-3/+4
* | | | | | | | | | | | | | Merge pull request #14416 from owncloud/setup-commandThomas Müller2015-02-2311-76/+223
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added unit test for app filterVincent Petry2015-02-234-57/+175