summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 8.2.1v8.2.1C Montero-Luque2015-11-171-2/+2
* 8.2.1 RC4v8.2.1RC4C Montero-Luque2015-11-171-2/+2
* Merge pull request #20542 from owncloud/password_policy-is-not-experimantal-s...Thomas Müller2015-11-161-1/+2
|\
| * password_policy is a shipped appThomas Müller2015-11-161-1/+2
|/
* 8.2.1 RC3 (previous commit incorrect)v8.2.1RC3C Montero-Luque2015-11-131-1/+1
* 8.2.1C Montero-Luque2015-11-131-2/+2
* 8.2.1 RC2v8.2.1RC2C Montero-Luque2015-11-101-2/+2
* Merge pull request #20446 from owncloud/backport-20093+20124-stable8.2C. Montero Luque2015-11-105-9/+59
|\
| * Backport of #20093 and #20124Arthur Schiwon2015-11-105-9/+59
* | Merge pull request #20443 from owncloud/stable8.2-set-ie-class-for-ie10plusVincent Petry2015-11-102-1/+14
|\ \ | |/ |/|
| * Set "ie" CSS class for IE10, IE11Vincent Petry2015-11-102-1/+14
* | Merge pull request #20440 from owncloud/stable8.2-checkboxMorris Jobke2015-11-101-1/+1
|\ \
| * | use new checkbox style for Apps mgmt settingsJan-Christoph Borchardt2015-11-101-1/+1
* | | Merge pull request #20432 from owncloud/cache-escape-like-82Vincent Petry2015-11-104-1/+52
|\ \ \
| * | | escape like parameter in cache moveRobin Appelman2015-11-101-1/+2
| * | | Add test for special character during moveRobin Appelman2015-11-101-0/+48
| * | | define escape character for like statements on oracleRobin Appelman2015-11-101-0/+1
| * | | define escape character for like statements on sqliteRobin Appelman2015-11-101-0/+1
* | | | Merge pull request #20441 from owncloud/stable8.2-font-styleMorris Jobke2015-11-107-12/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | move font back from Light to Regular for body text on normal-res screens, fix...Jan-Christoph Borchardt2015-11-107-12/+28
|/ / /
* | | Merge pull request #20308 from owncloud/stable8.2-backport-use-actual-mimetyp...Morris Jobke2015-11-101-9/+9
|\ \ \ | |/ / |/| |
| * | Use actual mimetype detection instead of extensionLukas Reschke2015-11-041-9/+9
* | | Merge pull request #20392 from owncloud/storage_not_available_8.2Vincent Petry2015-11-101-1/+16
|\ \ \
| * | | use a HintException to have some useful user output in case of an errorBjörn Schießle2015-11-101-1/+16
* | | | Merge pull request #20411 from owncloud/stable8.2-20383Vincent Petry2015-11-101-28/+36
|\ \ \ \
| * | | | Properly detect setup check messages set in the HTML templateRobin McCorkell2015-11-091-28/+36
* | | | | Merge pull request #20417 from owncloud/stable82_20403_backportMorris Jobke2015-11-101-2/+2
|\ \ \ \ \
| * | | | | Fix Error message when sharing outside of groupRoeland Jago Douma2015-11-101-2/+2
| |/ / / /
* | | | | Merge pull request #20410 from owncloud/backport-20333-stable8.2Vincent Petry2015-11-107-12/+26
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | make all the buttons beautifulArthur Schiwon2015-11-097-12/+26
|/ / / /
* | | | Merge pull request #20328 from owncloud/stable8.2-users-fixeveryonecountVincent Petry2015-11-095-55/+114
|\ \ \ \
| * | | | Fix everyone count for subadminsVincent Petry2015-11-055-55/+114
* | | | | Merge pull request #20361 from owncloud/stable8.2-extstorage-gdrive-forceappr...Vincent Petry2015-11-091-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Force approval in GDrive oauth to get refresh_tokenVincent Petry2015-11-061-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #20387 from owncloud/backport-20348-integer-group-namesVincent Petry2015-11-092-1/+29
|\ \ \ \
| * | | | Make sure that group names are strings not integersJoas Schilling2015-11-092-1/+29
* | | | | Merge pull request #20326 from owncloud/getfileinfo-locking82Vincent Petry2015-11-093-65/+88
|\ \ \ \ \
| * | | | | when a file is locked use old cache dataRobin Appelman2015-11-051-29/+37
| * | | | | only lock in getDirectoryContent if we need to update the cacheRobin Appelman2015-11-051-22/+18
| * | | | | only lock in getFileInfo if we need to update the cacheRobin Appelman2015-11-051-18/+16
| * | | | | Split checkUpdateRobin Appelman2015-11-052-45/+66
| | |_|/ / | |/| | |
* | | | | Merge pull request #20331 from owncloud/fix_20234_8.2Vincent Petry2015-11-092-1/+109
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | make sure that we update the unencrypted size for the versionsBjörn Schießle2015-11-052-1/+109
| |/ / /
* | | | Merge pull request #20357 from owncloud/backport-20271-stable8.2Morris Jobke2015-11-062-20/+149
|\ \ \ \
| * | | | integration testsArthur Schiwon2015-11-061-0/+118
| * | | | LDAP: attempt to connect to backup server again, if main server is not availa...Arthur Schiwon2015-11-061-20/+31
| | |/ / | |/| |
* | | | Merge pull request #20366 from owncloud/stable8.2-backport-20346Thomas Müller2015-11-061-0/+8
|\ \ \ \
| * | | | Show the language code in personal settings for unknown languagesMorris Jobke2015-11-061-0/+8
| |/ / /
* | | | Merge pull request #20364 from owncloud/stable8.2-backport-20359Thomas Müller2015-11-061-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Mark files_drop as shippedLukas Reschke2015-11-061-0/+1
|/ / /