summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 7.0.4 RC2v7.0.4RC2Frank Karlitschek2014-12-051-2/+2
* Merge pull request #12623 from owncloud/fix-s2s-oc7Björn Schießle2014-12-041-1/+1
|\
| * password column needs to allow null otherwise Oracle will break for empty pas...Bjoern Schiessle2014-12-041-1/+1
* | Merge pull request #12309 from owncloud/ldap-cache-user-countblizzz2014-12-041-0/+5
|\ \
| * | cache total user countArthur Schiwon2014-11-191-0/+5
* | | Merge pull request #12493 from owncloud/ldap_search_perfblizzz2014-12-044-2/+153
|\ \ \ | |_|/ |/| |
| * | trim search string before passing it onArthur Schiwon2014-12-041-1/+1
| * | LDAP search filter creation changes:Arthur Schiwon2014-11-281-1/+40
| * | add ldap-search command to occArthur Schiwon2014-11-283-0/+112
* | | Merge pull request #12528 from owncloud/backport-12419Thomas Müller2014-12-035-6/+39
|\ \ \
| * | | Allow read-only configurationLukas Reschke2014-12-015-6/+39
* | | | add proper description what database is supported by CE and EEMorris Jobke2014-12-031-7/+13
* | | | 7.0.4 RC1v7.0.4RC1Frank Karlitschek2014-12-011-2/+2
|/ / /
* | | Merge pull request #11747 from owncloud/storeCredentialsOnlyInSessionIfRequiredVincent Petry2014-12-0112-4/+416
|\ \ \
| * | | Only store user credentials when SMB_OC storage is enabledLukas Reschke2014-11-201-3/+27
| * | | Backport \OC\Security\Crypto to ownCloud 7Lukas Reschke2014-11-2011-1/+389
* | | | Merge pull request #12496 from owncloud/check-xml-writer-for-7Thomas Müller2014-12-011-0/+7
|\ \ \ \
| * | | | Check for XMLWriter classLukas Reschke2014-11-281-0/+7
* | | | | Adjust sample configLukas Reschke2014-11-281-1/+1
* | | | | Disable MSSQL for new CE installationsLukas Reschke2014-11-281-1/+3
|/ / / /
* | | | Markup correctionsCarla Schroder2014-11-281-3/+2
* | | | Add notes that SQLite is CE onlyCarla Schroder2014-11-281-2/+5
| |/ / |/| |
* | | delete old previewsGeorg Ehrke2014-11-271-1/+1
* | | added comment that App Store is disabled for EECarla Schroder2014-11-261-0/+1
* | | Don't show favicon to prevent iteration through subfoldersLukas Reschke2014-11-261-1/+1
* | | Consolidate if statement, and update unit testMiguel Prokop2014-11-262-8/+4
* | | fix calculation of expiration date if there is a default expiration date set ...Miguel Prokop2014-11-261-3/+8
* | | Merge pull request #12397 from owncloud/fix-undefined-appitemMorris Jobke2014-11-261-1/+1
|\ \ \
| * | | fixes undefined appitem - fixes #12396Morris Jobke2014-11-251-1/+1
* | | | Merge pull request #12415 from owncloud/port-12262Morris Jobke2014-11-251-1/+1
|\ \ \ \
| * | | | The "dir" key is used within the public sharing template to indicate in which...Lukas Reschke2014-11-251-1/+1
| |/ / /
* | | | Try to read the file only instead of trying to touchLukas Reschke2014-11-251-3/+3
* | | | use login name to verify passwordBjoern Schiessle2014-11-251-1/+2
|/ / /
* | | Merge pull request #12373 from owncloud/backport_preview_fixes_stable7Morris Jobke2014-11-241-20/+105
|\ \ \
| * | | delete all children's previews when deleting a folderGeorg Ehrke2014-11-231-14/+93
| * | | add y to with-aspect naming schemaGeorg Ehrke2014-11-231-7/+13
* | | | Use `/` as redirect location if webroot is set to an empty valueLukas Reschke2014-11-241-1/+5
|/ / /
* | | Merge pull request #12131 from owncloud/stable7-enc-recoverykeywithextstoragefixVincent Petry2014-11-202-9/+58
|\ \ \ | |/ / |/| |
| * | Fix file upload to ext storage when recovery key is enabledVincent Petry2014-11-172-9/+58
* | | Show warning when invalid user was passedVincent Petry2014-11-201-0/+8
| |/ |/|
* | adjust autocomplete behavior for sharing menuCraig Morrissey2014-11-191-1/+1
* | Merge pull request #12288 from owncloud/backport-mapper-fixesJoas Schilling2014-11-191-26/+49
|\ \
| * | Fix mapping of relative pathsLukas Reschke2014-11-191-14/+30
| * | Use md5() of the original name instead of uniqid() for slugifyingJoas Schilling2014-11-191-1/+12
| * | Fix code layout before fixing the functionJoas Schilling2014-11-191-13/+9
* | | Merge pull request #12291 from owncloud/issue/10991-stable7-backportJoas Schilling2014-11-1947-425/+805
|\ \ \ | |/ / |/| |
| * | fixing cache routesClark Tomlinson2014-11-192-6/+6
| * | use the new base class for share/share.php testsBjoern Schiessle2014-11-191-10/+12
| * | Simple fix for the wrong Mapper resetJoas Schilling2014-11-192-3/+6
| * | Back to OC_Util::generateRandomBytes()Joas Schilling2014-11-191-4/+1