summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14665 from owncloud/fileid-incrementMorris Jobke2015-03-267-1/+218
|\
| * Add repair step to fix SQLite autoincrementVincent Petry2015-03-263-0/+168
| * Rename platformRobin Appelman2015-03-252-2/+2
| * triger db upgrade to set autoincrement for sqliteRobin Appelman2015-03-251-1/+1
| * Add custom sqlite platform to set auto incrementRobin Appelman2015-03-252-0/+36
| * SQLite autoincrement testVincent Petry2015-03-251-0/+13
* | Merge pull request #15228 from owncloud/add-missing-navigation-for-tips-n-tricksThomas Müller2015-03-261-0/+1
|\ \
| * | Add navigation entry for tips and tricks setionJoas Schilling2015-03-261-0/+1
* | | Merge pull request #15230 from owncloud/sqlite-noticeJan-Christoph Borchardt2015-03-261-11/+10
|\ \ \
| * | | move SQLite notice from warnings to tips & tricksJan-Christoph Borchardt2015-03-261-11/+10
* | | | Merge pull request #14958 from owncloud/dropdown-styleJan-Christoph Borchardt2015-03-2614-73/+147
|\ \ \ \
| * | | | mock up missing elements in the testsJan-Christoph Borchardt2015-03-262-2/+5
| * | | | only move dropdown triangle when navigation is opened, fix timing bugJan-Christoph Borchardt2015-03-261-7/+14
| * | | | detail corrections for search box layoutJan-Christoph Borchardt2015-03-261-2/+2
| * | | | fix user dropdown for IE8Jan-Christoph Borchardt2015-03-261-2/+3
| * | | | adjust animations of Share, Versions and others to OC.menuSpeedJan-Christoph Borchardt2015-03-263-21/+22
| * | | | reintroduce quick animation for menusJan-Christoph Borchardt2015-03-261-7/+7
| * | | | fix log in issue, fix arrow position, make dropdown work in FirefoxJan-Christoph Borchardt2015-03-261-3/+4
| * | | | fix accessibility of ownCloud logo and navigation entries, fix #15013gJan-Christoph Borchardt2015-03-263-9/+23
| * | | | move triangle of apps dropdown to align with app name triangleJan-Christoph Borchardt2015-03-261-0/+6
| * | | | reduce logo size a bit for a better lookJan-Christoph Borchardt2015-03-263-2/+2
| * | | | adjust share dropdown border radius to 3pxJan-Christoph Borchardt2015-03-261-10/+10
| * | | | more small fixes in headerJan-Christoph Borchardt2015-03-262-9/+11
| * | | | further adjustments of header and dropdown stylesJan-Christoph Borchardt2015-03-263-10/+29
| * | | | popover style for apps and user dropdown menusJan-Christoph Borchardt2015-03-262-23/+43
* | | | | Merge pull request #14495 from owncloud/update-mailmap-01Thomas Müller2015-03-26843-6291/+16123
|\ \ \ \ \
| * | | | | Update license headersJenkins for ownCloud2015-03-26841-6255/+16060
| * | | | | detect MIT licensed files and ignore them for nowThomas Müller2015-03-261-1/+18
| * | | | | properly break after the first comment ends + allow to pass in one file/folde...Thomas Müller2015-03-261-25/+29
| * | | | | Updating email of nickvergessen and georgThomas Müller2015-03-261-5/+6
| * | | | | fixing ignorance of 'Not Committed Yet'Thomas Müller2015-03-261-1/+4
| * | | | | Updating .mailmapThomas Müller2015-03-261-4/+6
* | | | | | Merge pull request #15226 from owncloud/fix-upload-placeholderJoas Schilling2015-03-261-1/+1
|\ \ \ \ \ \
| * | | | | | Revert "add https:// placeholder for From Link feature. closes #13255"Robin McCorkell2015-03-261-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-listJoas Schilling2015-03-261-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Correctly only send the errors of the current file to the eventJoas Schilling2015-03-261-2/+3
* | | | | | Merge pull request #15218 from owncloud/revert-oc-etag-masterThomas Müller2015-03-263-48/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "adding OC-ETag header"Vincent Petry2015-03-262-20/+2
| * | | | | Revert "adding unit tests"Vincent Petry2015-03-262-33/+5
|/ / / / /
* | | | | Merge pull request #15212 from owncloud/log-widthMorris Jobke2015-03-263-3/+7
|\ \ \ \ \
| * | | | | force log messages to break to alleviate horizontal scroll on Admin pageJan-Christoph Borchardt2015-03-263-3/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #15168 from owncloud/oc-etag-masterVincent Petry2015-03-263-2/+48
|\ \ \ \ \
| * | | | | adding unit testsThomas Müller2015-03-262-5/+33
| * | | | | adding OC-ETag headerThomas Müller2015-03-242-2/+20
* | | | | | Merge pull request #14125 from dratini0/masterLukas Reschke2015-03-261-1/+7
|\ \ \ \ \ \
| * | | | | | Removed simplified X-accel-redirect even furtherdratini02015-03-231-6/+1
| * | | | | | Changed the disputed while loop to a single if.dratini02015-03-231-2/+2
| * | | | | | Extending the X-accel redirect functionality with a more scalable approach.dratini02015-02-111-1/+10
| * | | | | | Revert "Fix: X-Accel-Redirect did not support custom data dir and local mounts"dratini02015-02-111-1/+1
| * | | | | | Revert "removed a little duplication"dratini02015-02-111-1/+3