summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14399 from owncloud/ignore-empty-pluralsLukas Reschke2015-03-265-43/+7
|\
| * Revert "Correctly fallback to english, if the plural case is not translated"Joas Schilling2015-02-204-41/+4
| * Ignore empty plurals just like with singularsJoas Schilling2015-02-201-2/+3
* | Merge pull request #15129 from owncloud/version-command-busLukas Reschke2015-03-267-10/+132
|\ \
| * | teardown after we're doneRobin Appelman2015-03-261-0/+1
| * | save uid instead of user object in commandRobin Appelman2015-03-262-5/+5
| * | check limit of serialized command in unit testsRobin Appelman2015-03-261-0/+3
| * | ensure commands can be serialized in unit testsRobin Appelman2015-03-261-1/+4
| * | Setup the filesystem in the expire commandRobin Appelman2015-03-263-4/+24
| * | Handle exceptions thrown during hooks when running unit testsRobin Appelman2015-03-262-0/+11
| * | Force test cases using background commands to handle setting up the filesystemRobin Appelman2015-03-263-3/+22
| * | expire versions in a background commandRobin Appelman2015-03-262-5/+70
* | | Merge pull request #15232 from owncloud/remove-arg-separator-magicLukas Reschke2015-03-261-1/+0
|\ \ \
| * | | Remove custom `arg_separator.output`Lukas Reschke2015-03-261-1/+0
* | | | 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