summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Uses OC.basename instead of custom codeGuillaume AMAT2014-02-191-2/+2
* Gets the page title from oc_defaults in Files appGuillaume AMAT2014-02-131-1/+1
* Adds OC_Defaults values in javascript configGuillaume AMAT2014-02-131-0/+17
* Update page title when navigating through directoriesGuillaume AMAT2014-02-121-3/+31
* Merge pull request #7085 from owncloud/quick-fix-7019-masterThomas Müller2014-02-111-0/+1
|\
| * Load authentication apps to get users from all backends - fixes #7019Thomas Müller2014-02-051-0/+1
* | Merge pull request #7075 from owncloud/quota-storagexsendfileVincent Petry2014-02-115-1/+36
|\ \
| * | Added isLocal() method to storage, used for xsendfileVincent Petry2014-02-065-1/+36
* | | intendationArthur Schiwon2014-02-111-5/+5
* | | fix DIArthur Schiwon2014-02-112-5/+8
* | | Inject loggerArthur Schiwon2014-02-112-3/+13
* | | wrong tldArthur Schiwon2014-02-111-1/+1
* | | test for share dialoge sorterArthur Schiwon2014-02-111-0/+40
* | | sort following entries in alphabetical orderArthur Schiwon2014-02-111-3/+4
* | | move sorter into a classArthur Schiwon2014-02-112-24/+56
* | | respect coding guidelinesArthur Schiwon2014-02-111-1/+1
* | | on filtering the share box users and groups whose name begins with the search...Arthur Schiwon2014-02-111-0/+24
* | | Merge pull request #6881 from owncloud/remove-user-storage-entryVincent Petry2014-02-102-0/+22
|\ \ \
| * \ \ Merge branch 'master' into remove-user-storage-entryRobin Appelman2014-02-10160-5729/+17301
| |\ \ \
| * | | | Also clean up the filecache table when deleting a storage entryRobin Appelman2014-02-031-0/+6
| * | | | Revert "Use Cache->clear to cleanup the filecache for removed users"Robin Appelman2014-02-031-10/+5
| * | | | Use Cache->clear to cleanup the filecache for removed usersRobin Appelman2014-01-221-5/+10
| * | | | Also remove the user's home storage from the storage table when deleting a userRobin Appelman2014-01-212-0/+16
* | | | | LDAP: improve debug messageArthur Schiwon2014-02-101-1/+2
* | | | | LDAP: also try MS AD's thumbnailPhoto when looking for an avatar imageArthur Schiwon2014-02-101-6/+24
* | | | | Merge pull request #6988 from owncloud/oc_api_fix_warinigsTom Needham2014-02-101-6/+12
|\ \ \ \ \
| * | | | | getData() always needs to return an arrayBjoern Schiessle2014-02-071-6/+12
* | | | | | Merge pull request #7134 from owncloud/issue/5794Morris Jobke2014-02-101-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Make google drive client secret and dropbox api secret a password fieldJoas Schilling2014-02-071-2/+2
* | | | | | Merge pull request #7140 from owncloud/enc_dont_login_during_encryptionMorris Jobke2014-02-101-1/+8
|\ \ \ \ \ \
| * | | | | | refuse login as long as the initial encryption is runningBjoern Schiessle2014-02-101-1/+8
* | | | | | | 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