summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* LDAP: add documentation info in info.xmlArthur Schiwon2014-02-101-0/+3
* Merge pull request #7126 from nickvergessen/issue/6683Vincent Petry2014-02-102-4/+6
|\
| * Only add files to file list when uploading to current directoryJoas Schilling2014-02-072-4/+6
* | Rephrase and clarify log messageArthur Schiwon2014-02-101-1/+1
* | Wizard: enable base DN for editing, if not base DN could have been detected. ...Arthur Schiwon2014-02-101-0/+1
* | Wizard: disable LDAP referrals, fixes #6670Arthur Schiwon2014-02-101-0/+1
* | throw an info message, when base dn test failedArthur Schiwon2014-02-101-0/+4
* | LDAP: extend LDAP wrapper search method for sizelimit, improves performance i...Arthur Schiwon2014-02-102-4/+6
* | Merge pull request #7131 from owncloud/issue/6269Thomas Müller2014-02-102-7/+7
|\ \
| * | Change MySQL to MySQL/MariaDB in the frontendJoas Schilling2014-02-072-7/+7
* | | Merge pull request #7066 from owncloud/check_svg_installedThomas Müller2014-02-104-4/+4
|\ \ \
| * | | properly check if pdf and svg modules are installedGeorg Ehrke2014-02-044-4/+4
* | | | Merge pull request #7071 from jcfischer/masterThomas Müller2014-02-101-1/+2
|\ \ \ \
| * | | | close statement in MimeType detection is executed [#7069]Jens-Christian Fischer2014-02-041-1/+2
| |/ / /
* | | | Merge pull request #7133 from owncloud/fix-implied-evalThomas Müller2014-02-103-9/+7
|\ \ \ \
| * | | | Fix implied evals and doubled definition of variableMorris Jobke2014-02-073-9/+7
| | |/ / | |/| |
* | | | Merge pull request #6247 from owncloud/memcached-multiple-serversAndreas Fischer2014-02-082-4/+18
|\ \ \ \
| * | | | Readd support for memcached_server config variable.Andreas Fischer2014-01-101-1/+9
| * | | | Add support for multiple memcached servers.Andreas Fischer2014-01-102-4/+10
* | | | | name users after testBjoern Schiessle2014-02-071-2/+2
| |/ / / |/| | |
* | | | Merge pull request #7112 from owncloud/enc_fix_size_for_shared_filesVincent Petry2014-02-073-4/+22
|\ \ \ \
| * | | | replace 'size' with 'unencrypted_size' if encryption is enabledBjoern Schiessle2014-02-073-4/+22
* | | | | Merge pull request #6997 from owncloud/fix_l10n_warningsThomas Müller2014-02-071-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | change order of issubdirectory() calls to avoid error messages for non-appsBjoern Schiessle2014-01-291-2/+2
* | | | | Update README.mdThomas Müller2014-02-071-0/+1
* | | | | Update README.mdThomas Müller2014-02-071-1/+2
| |_|_|/ |/| | |
* | | | Merge pull request #6952 from MartialGeek/add_freebox_supportVincent Petry2014-02-063-1/+21
|\ \ \ \
| * | | | The regexp of the Freebox user agent is now more strict.Martial Saunois2014-01-292-1/+6
| * | | | Unit tests added for the new Freebox user agent.Martial Saunois2014-01-281-0/+10
| * | | | New user agent added for the Freebox.Martial Saunois2014-01-262-1/+6
* | | | | Merge pull request #6445 from owncloud/fix_5956Vincent Petry2014-02-061-2/+2
|\ \ \ \ \
| * | | | | encode imagePath and fix documentation of loadFromFileGeorg Ehrke2014-01-111-2/+2
| * | | | | fix issue with logging non utf8 charsGeorg Ehrke2013-12-161-1/+1
* | | | | | Merge pull request #7099 from owncloud/fix-autoconfig-masterThomas Müller2014-02-061-4/+5
|\ \ \ \ \ \
| * | | | | | fixing autoconfig handlingThomas Müller2014-02-051-4/+5
* | | | | | | Merge pull request #7089 from owncloud/sharing-searchbymimeVincent Petry2014-02-062-9/+164
|\ \ \ \ \ \ \
| * | | | | | | Fixed searchByMime in shared cacheVincent Petry2014-02-052-9/+164
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #7105 from NCTU-NBA/pr-7098Morris Jobke2014-02-061-9/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove unused template variable assignment of files_sharing/template/public.phpPellaeon Lin2014-02-061-5/+0
| * | | | | | Move template variable assignment to correct placePellaeon Lin2014-02-061-4/+5
|/ / / / / /
* | | | | | Merge pull request #7091 from owncloud/jenkins-catchsetuperrorsThomas Müller2014-02-051-2/+6
|\ \ \ \ \ \
| * | | | | | Catch setup errors during autotestVincent Petry2014-02-051-2/+6
| |/ / / / /
* | | | | | Merge pull request #6490 from owncloud/theming-for-appstemplateJan-Christoph Borchardt2014-02-051-0/+4
|\ \ \ \ \ \
| * | | | | | use appstoreenabled config switchBjoern Schiessle2014-01-161-2/+2
| * | | | | | do not show 'Add app' and 'More apps' for themed ownCloudJan-Christoph Borchardt2013-12-181-0/+4
* | | | | | | Merge pull request #7064 from owncloud/files-scrolltopafterupdateJan-Christoph Borchardt2014-02-051-4/+5
|\ \ \ \ \ \ \
| * | | | | | | Scroll to the top after switching dirVincent Petry2014-02-041-5/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #7032 from owncloud/enc_fix_deleteBjörn Schießle2014-02-059-119/+430
|\ \ \ \ \ \ \
| * | | | | | | add function to extract filename from sharekey name + testsBjoern Schiessle2014-02-032-1/+37
| * | | | | | | added tests for the delete hooks if the trash bin is disabledBjoern Schiessle2014-02-013-65/+300