summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-046-0/+8
* Merge pull request #16703 from owncloud/fix-ie8-ie9Morris Jobke2015-06-031-0/+6
|\
| * Add min-height to login page for IE8 and IE9Morris Jobke2015-06-031-0/+1
| * Revert "fix theme in IE8 and IE9"Morris Jobke2015-06-031-0/+5
* | Merge pull request #16434 from owncloud/persist-maintenance-stateThomas Müller2015-06-032-5/+13
|\ \ | |/ |/|
| * Persist the state of the maintenance after an upgradeMorris Jobke2015-05-192-5/+13
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-0314-2/+20
* | Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-previewMorris Jobke2015-06-021-3/+11
|\ \
| * | Escape single quotesOlivier Paroz2015-05-291-0/+2
| * | Fix for parenthesisOlivier Paroz2015-05-291-1/+1
| * | Get a 96x96 preview for file conflict resolutionOlivier Paroz2015-05-291-3/+9
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-0264-64/+2
* | | Fix grammar of search results phraseTom Needham2015-06-011-1/+1
* | | Merge pull request #16650 from owncloud/fix-sqlite-only-setupThomas Müller2015-06-011-1/+4
|\ \ \
| * | | [setup] Disable buttons only in the case they are presentMorris Jobke2015-06-011-1/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-312-2/+2
| |/ / |/| |
* | | Merge pull request #16517 from owncloud/remove-logo-wideThomas Müller2015-05-296-20/+8
|\ \ \
| * | | also replace logo-mail with new lookJan-Christoph Borchardt2015-05-221-0/+0
| * | | replace logo-wide on share page as well with better icon + textJan-Christoph Borchardt2015-05-225-20/+8
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-294-4/+8
* | | | Merge pull request #16380 from rullzer/fix_16281Morris Jobke2015-05-282-15/+117
|\ \ \ \
| * | | | Properly format remote recipientsRoeland Jago Douma2015-05-272-15/+117
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2828-74/+144
* | | | | Merge pull request #16417 from owncloud/master-16415Morris Jobke2015-05-271-5/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix theme in IE8 and IE9Morris Jobke2015-05-181-5/+0
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-272-4/+4
* | | | | Merge pull request #15985 from owncloud/hotfix/fix-encryption-referencesBjörn Schießle2015-05-261-1/+1
|\ \ \ \ \
| * | | | | fix references to legacy encryption app nameClark Tomlinson2015-05-181-1/+1
| |/ / / /
* | | | | Merge pull request #16565 from owncloud/add-urandom-checkThomas Müller2015-05-262-3/+24
|\ \ \ \ \
| * | | | | Add check for availability of /dev/urandomLukas Reschke2015-05-262-3/+24
| | |_|/ / | |/| | |
* | | | | Merge pull request #16521 from owncloud/unbold-placeholder-imageVincent Petry2015-05-261-1/+1
|\ \ \ \ \
| * | | | | use normal font weight instead of bold for image placeholdersJan-Christoph Borchardt2015-05-221-1/+1
| |/ / / /
* | | | | Merge pull request #16520 from owncloud/fix-float-spinner-positionVincent Petry2015-05-261-1/+4
|\ \ \ \ \
| * | | | | fix float spinner positionJan-Christoph Borchardt2015-05-221-1/+4
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-262-0/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-252-2/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-244-0/+30
* | | | | Unit tests for #16511Roeland Jago Douma2015-05-221-0/+80
| |/ / / |/| | |
* | | | Merge pull request #16473 from owncloud/occ_16221Joas Schilling2015-05-211-2/+12
|\ \ \ \
| * | | | Skip disable3rdParty AppsSteffen Lindner2015-05-201-2/+12
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-05-2122-0/+46
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-202-2/+2
* | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-05-191-1/+0
* | | Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewithThomas Müller2015-05-192-4/+6
|\ \ \ | |_|/ |/| |
| * | add support for limit request parameter to getShareWithCraig Morrissey2015-05-152-4/+6
* | | Add hint about additional PHP database modulesMorris Jobke2015-05-183-1/+11
| |/ |/|
* | Merge pull request #15738 from rullzer/fix_15611Vincent Petry2015-05-182-10/+53
|\ \
| * | Fix to make sure expiration date is properly setRoeland Jago Douma2015-05-182-10/+53
* | | Reset share dialog values so we start out cleanRoeland Jago Douma2015-05-182-0/+111
|/ /
* | Merge pull request #16242 from owncloud/use-oc-webrootThomas Müller2015-05-151-4/+1
|\ \ | |/ |/|