summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mastix-master'Morris Jobke2017-10-251-2/+2
|\
| * Updated OpenGraph title to display folder name instead of a nextcloud standar...Sascha Sambale2017-10-251-2/+2
|/
* Merge pull request #6947 from nextcloud/fix_6821Morris Jobke2017-10-251-1/+1
|\
| * Use new-password as autocomplete on share auth pageRoeland Jago Douma2017-10-251-1/+1
* | Merge pull request #6940 from nextcloud/master-6935-ellipsisJoas Schilling2017-10-252-3/+3
|\ \ | |/ |/|
| * Add space between ellipsis and wordMorris Jobke2017-10-252-3/+3
* | [tx-robot] updated from transifexNextcloud bot2017-10-25100-80/+396
* | Merge pull request #6709 from nextcloud/show-checkbox-where-the-favourite-ico...Morris Jobke2017-10-2514-157/+289
|\ \ | |/ |/|
| * Solve acceptance test failure due to clicks on covered elementsDaniel Calviño Sánchez2017-10-192-0/+32
| * Extend the clickable area of the file name to include the thumbnailDaniel Calviño Sánchez2017-10-191-1/+2
| * Move checkboxes to their own columnDaniel Calviño Sánchez2017-10-197-63/+77
| * Remove "has-favorites" class from file list tableDaniel Calviño Sánchez2017-10-192-4/+0
| * Move favorite mark to the top right corner of the thumbnailDaniel Calviño Sánchez2017-10-195-38/+22
| * Set background size for thumbnail in CSS instead of JavaScriptDaniel Calviño Sánchez2017-10-192-2/+3
| * Show always the checkboxDaniel Calviño Sánchez2017-10-191-2/+2
| * Replace inline favorite action with just a favorite iconDaniel Calviño Sánchez2017-10-194-147/+60
| * Update acceptance tests to favorite files through the file actions menuDaniel Calviño Sánchez2017-10-191-2/+20
| * Add "Favorite" action to the file actions menuDaniel Calviño Sánchez2017-10-193-2/+131
| * Add support to FileActionsMenu for icon class functionsDaniel Calviño Sánchez2017-10-193-1/+45
* | Merge pull request #6936 from nextcloud/master-6935Morris Jobke2017-10-251-1/+1
|\ \
| * | Replace ... with …Morris Jobke2017-10-241-1/+1
* | | Merge pull request #6918 from nextcloud/rotate_job_by_defaultRoeland Jago Douma2017-10-246-14/+55
|\ \ \
| * | | Update autoloaderRoeland Jago Douma2017-10-242-0/+2
| * | | Add logrote as a default background jobRoeland Jago Douma2017-10-244-14/+53
* | | | Merge pull request #6921 from nextcloud/appmanager-securitymiddlewareRoeland Jago Douma2017-10-243-4/+19
|\ \ \ \
| * | | | Use proper DI for security middleware for app enabled checkMorris Jobke2017-10-243-4/+19
* | | | | Merge pull request #6934 from nextcloud/class-usage-in-mocksRoeland Jago Douma2017-10-24146-740/+947
|\ \ \ \ \
| * | | | | Use ::class in test mocksMorris Jobke2017-10-24146-740/+947
| | |_|/ / | |/| | |
* | | | | Merge pull request #6928 from nextcloud/remove-unneeded-methodMorris Jobke2017-10-241-15/+0
|\ \ \ \ \
| * | | | | Remove unused method of OC_AppMorris Jobke2017-10-241-15/+0
* | | | | | Merge pull request #6930 from nextcloud/use-proper-di-for-repair-stepMorris Jobke2017-10-242-4/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use proper DI for repair commandMorris Jobke2017-10-242-4/+9
| |/ / / /
* | | | | Merge pull request #6919 from nextcloud/di-appmanager-encryption-migrationMorris Jobke2017-10-244-13/+34
|\ \ \ \ \
| * | | | | Use DI for IAppManager to encryption migrationMorris Jobke2017-10-244-13/+34
| | |/ / / | |/| | |
* | | | | Merge pull request #6922 from nextcloud/unneeded-isEnabled-checkBjörn Schießle2017-10-243-65/+34
|\ \ \ \ \
| * | | | | Remove unneeded check if app is enabledMorris Jobke2017-10-233-65/+34
| |/ / / /
* | | | | Merge pull request #6929 from nextcloud/deprecate-private-methodBjörn Schießle2017-10-241-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Deprecate OC_App:isEnabledMorris Jobke2017-10-241-0/+1
|/ / / /
* | | | Merge pull request #6920 from nextcloud/appmanager-usageMorris Jobke2017-10-247-9/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | Use appmanager instead of OC_App for check for enabled appMorris Jobke2017-10-237-9/+12
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-10-24210-178/+4660
* | | Merge pull request #6864 from nextcloud/phpdoc-fix-issuesMorris Jobke2017-10-2310-10/+10
|\ \ \
| * | | Revert copyright changesJulius Härtl2017-10-234-2/+5
| * | | Doc: Fix phpDoc issuesJulius Härtl2017-10-2314-15/+12
|/ / /
* | | Merge pull request #6915 from nextcloud/css-border-radiusJoas Schilling2017-10-231-2/+0
|\ \ \
| * | | Border-radius does not need the vendor prefixes anymoreMorris Jobke2017-10-231-2/+0
| |/ /
* | | Merge pull request #6916 from nextcloud/css-box-sizingJohn Molakvoæ2017-10-233-8/+0
|\ \ \
| * | | Box-sizing does not need vendor prefix anymoreMorris Jobke2017-10-233-8/+0
| |/ /
* | | Merge pull request #6917 from nextcloud/css-box-shadowJohn Molakvoæ2017-10-233-6/+0
|\ \ \
| * | | Box-shadow does not need vendor prefix anymoreMorris Jobke2017-10-233-6/+0
| |/ /