summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add save button for setting LDAP Agent DN and PasswordArthur Schiwon2017-10-273-4/+48
* Fix regression: undesired writes to the DBArthur Schiwon2017-10-271-1/+1
* LDAP: only write actually changes values to the DBArthur Schiwon2017-10-271-2/+8
* first, remove the hackArthur Schiwon2017-10-272-12/+0
* Merge pull request #6977 from Fiech/masterJoas Schilling2017-10-271-0/+6
|\
| * Added additional methods for removal of sensitive infoJohannes Schlichenmaier2017-10-271-0/+6
* | [tx-robot] updated from transifexNextcloud bot2017-10-2728-32/+128
* | Merge pull request #6973 from nextcloud/menu-highlightMorris Jobke2017-10-262-0/+3
|\ \
| * | Add blue highlight to active menu entryJan-Christoph Borchardt2017-10-242-0/+3
* | | Merge pull request #6970 from nextcloud/class-usage-in-mocks-encryption-appMorris Jobke2017-10-2627-115/+176
|\ \ \
| * | | Use ::class in test mocks of encryption appMorris Jobke2017-10-2627-115/+176
|/ / /
* | | Merge pull request #6939 from nextcloud/class-usage-in-mocks-dav-appMorris Jobke2017-10-2642-113/+159
|\ \ \
| * | | Fix another warningMorris Jobke2017-10-261-4/+5
| * | | Use ::class in test mocks of dav appMorris Jobke2017-10-2641-109/+154
| |/ /
* | | Merge pull request #6949 from nextcloud/cachingrouter_localRoeland Jago Douma2017-10-261-2/+2
|\ \ \
| * | | Use local cache for the CachingRouterRoeland Jago Douma2017-10-251-2/+2
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-26102-150/+226
| |_|/ |/| |
* | | 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
|\ \ \ \ \