summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove double spaceMorris Jobke2014-06-141-1/+1
* Merge pull request #8978 from owncloud/movie_preview_improvementsMorris Jobke2014-06-141-8/+17
|\
| * movie previews: use file directly when it's stored locally and encryption is ...Georg Ehrke2014-06-101-8/+17
* | Merge pull request #9025 from owncloud/fix-mail-settingsVolkan Gezer2014-06-131-2/+2
|\ \
| * | fix mail settings save function - ref #8854Morris Jobke2014-06-131-2/+2
* | | Merge pull request #9018 from owncloud/dbms-socket-supportFrank Karlitschek2014-06-132-26/+20
|\ \ \ | |/ / |/| |
| * | Don't specify host when using a socket.Andreas Fischer2014-06-121-1/+1
| * | Rename variable to indicate that it can be port and socket.Andreas Fischer2014-06-121-4/+4
| * | No need to check the port number as this will fail anyway.Andreas Fischer2014-06-121-1/+1
| * | Move getValue() to where required. This actually is not required "global data".Andreas Fischer2014-06-121-9/+5
| * | Move check for : to where it belongs, getting rid of $socket = false;Andreas Fischer2014-06-121-8/+5
| * | Extract common variables of $connectionParams.Andreas Fischer2014-06-121-11/+8
| * | Inline $port expression, getting rid of $port variable.Andreas Fischer2014-06-121-2/+1
| * | Fixes based on suggestionsjosh4trunks2014-06-111-11/+7
| * | Update notes on dbhostjosh4trunks2014-06-051-1/+1
| * | Fix variable not always being defined.josh4trunks2014-06-041-0/+2
| * | Work with MySQL Socketsjosh4trunks2014-06-041-1/+8
* | | Merge pull request #9010 from owncloud/fix_8941_admin_settings_messageMorris Jobke2014-06-1310-457/+0
|\ \ \
| * | | move mail template editor from core to standalone templateeditor repoJörn Friedrich Dreyer2014-06-1310-457/+0
| * | | access admin settings result message correctlyJörn Friedrich Dreyer2014-06-131-1/+1
|/ / /
* | | Merge pull request #8714 from owncloud/minor-fixesMorris Jobke2014-06-132-4/+4
|\ \ \
| * | | fix some minor issuesVolkan Gezer2014-06-132-4/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1342-186/+263
* | | | Merge pull request #9017 from owncloud/maxheartbeatintervalMorris Jobke2014-06-132-1/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Added unit tests for heartbeat interval min/max valuesVincent Petry2014-06-121-1/+23
| * | | Added max heartbeat interval to prevent integer overflowVincent Petry2014-06-121-0/+5
* | | | Merge pull request #8968 from owncloud/scanner-parent-repairVincent Petry2014-06-122-39/+89
|\ \ \ \ | |/ / / |/| | |
| * | | remove unused argumentRobin Appelman2014-06-101-3/+2
| * | | add some commentsRobin Appelman2014-06-101-0/+2
| * | | Repair broken parent link in the scannerRobin Appelman2014-06-102-36/+85
| | |/ | |/|
* | | Revert "Merge pull request #8998 from macjohnny/master"Morris Jobke2014-06-122-13/+6
* | | Merge pull request #9004 from owncloud/cleanup-storagesVincent Petry2014-06-121-0/+26
|\ \ \
| * | | Added check and cleanup for storage/filecacheVincent Petry2014-06-121-0/+26
* | | | Merge pull request #8998 from macjohnny/mastermacjohnny2014-06-122-6/+13
|\ \ \ \
| * | | | Update manager.phpmacjohnny2014-06-121-1/+1
| * | | | Update group.phpmacjohnny2014-06-121-6/+0
| * | | | drastic speedup for nested ldap groupsmacjohnny2014-06-121-2/+3
| * | | | Update manager.phpmacjohnny2014-06-121-0/+12
| |/ / /
* | | | Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_sett...Bernhard Posselt2014-06-122-2/+2
|\ \ \ \
| * | | | fix liskov substitution principle in admin mail template settings, fixes #8997Jörn Friedrich Dreyer2014-06-122-2/+2
| |/ / /
* | | | Merge pull request #8999 from owncloud/issue/8996Morris Jobke2014-06-124-1/+6
|\ \ \ \
| * | | | Move IE8 fixes to fixes.cssMorris Jobke2014-06-122-1/+5
| * | | | Fix missing caret in header menu for IE8Joas Schilling2014-06-121-1/+1
| * | | | Fix header menu background in IE8Joas Schilling2014-06-121-0/+1
| * | | | Reduce size of png files so they match the svgJoas Schilling2014-06-122-0/+0
* | | | | Merge pull request #8980 from owncloud/better-accept-headerVincent Petry2014-06-123-20/+69
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | also handle lowercase headersBernhard Posselt2014-06-112-22/+31
| * | | | fix indentionBernhard Posselt2014-06-111-6/+6
| * | | | handle http accept headers more gracefullyBernhard Posselt2014-06-113-18/+58
* | | | | Merge pull request #8991 from owncloud/fix-php53-arraycombineVincent Petry2014-06-121-2/+7
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 17:43:46 +0000