summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4540 from nextcloud/settings-helpMorris Jobke2017-04-275-4/+9
|\
| * Add more hints to settingsJan-Christoph Borchardt2017-04-265-4/+9
* | Merge pull request #3770 from nextcloud/faster-search-in-contactsMorris Jobke2017-04-271-7/+6
|\ \
| * | Add back the name query partRoeland Jago Douma2017-04-211-1/+3
| * | Factorize query for searching contactsThomas Citharel2017-04-211-7/+4
* | | Merge pull request #4519 from nextcloud/downstream-27703Morris Jobke2017-04-262-0/+14
|\ \ \
| * | | Reload file list when leaving hidden stateVincent Petry2017-04-262-0/+14
* | | | Merge pull request #4517 from nextcloud/downstream-27637Morris Jobke2017-04-261-4/+4
|\ \ \ \
| * | | | Fix recovery checkbox label to properly pointVincent Petry2017-04-261-4/+4
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-27102-262/+228
* | | | Merge pull request #4461 from danxuliu/fix-closing-details-view-when-viewing-...Morris Jobke2017-04-261-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix closing details view when viewing file in folderDaniel Calviño Sánchez2017-04-251-0/+1
* | | | Merge pull request #4518 from nextcloud/downstream-25838Roeland Jago Douma2017-04-262-7/+88
|\ \ \ \
| * | | | Fix share indicator handlingVincent Petry2017-04-262-7/+88
| | |/ / | |/| |
* | | | Merge pull request #4374 from nextcloud/contactsmenu_popoverLukas Reschke2017-04-263-3/+25
|\ \ \ \
| * | | | fix CommentsTabsView js testGeorg Ehrke2017-04-261-1/+1
| * | | | add contactsmenu popover to commentsGeorg Ehrke2017-04-262-2/+24
* | | | | Merge pull request #4503 from nextcloud/downstream-27281Roeland Jago Douma2017-04-261-0/+1
|\ \ \ \ \
| * | | | | fix objectstore renameJoas Schilling2017-04-251-0/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #4512 from nextcloud/fix-translations-2Morris Jobke2017-04-263-6/+18
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Use correct plural form and add special strings for tomorrow and todayJoas Schilling2017-04-262-2/+14
| * | | | Fix past tenseJoas Schilling2017-04-261-4/+4
| |/ / /
* | | | Merge pull request #4478 from nextcloud/improve_settings_helpJoas Schilling2017-04-268-18/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Wording fixesJan-Christoph Borchardt2017-04-253-6/+4
| * | | Small layout fixes to settings hintsJan-Christoph Borchardt2017-04-252-3/+3
| * | | change the headline as suggestedFrank Karlitschek2017-04-251-2/+1
| * | | one more hintFrank Karlitschek2017-04-251-0/+1
| * | | adding some documentation hints and some smaller cleanupFrank Karlitschek2017-04-255-11/+11
| |/ /
* | | Merge pull request #4500 from nextcloud/downstream-27118Morris Jobke2017-04-263-26/+20
|\ \ \
| * | | Restrict proppatch to the proper nodesVincent Petry2017-04-253-26/+20
| |/ /
* | | Merge pull request #4416 from gvmura/avoid-duplicate-files-googleMorris Jobke2017-04-261-0/+13
|\ \ \
| * | | avoid duplicate files in google with the same namegvmura2017-04-211-0/+13
* | | | Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwoMorris Jobke2017-04-256-13/+332
|\ \ \ \
| * | | | Fix usersInGroup retrievalArthur Schiwon2017-04-252-14/+39
| * | | | fix method name due to changes in masterArthur Schiwon2017-04-251-1/+1
| * | | | Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2Arthur Schiwon2017-04-256-8/+302
| |\ \ \ \
| | * | | | user_ldap: Add support for gidNumberXuanwo2017-04-256-8/+302
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-2636-20/+348
* | | | | | Audit log for enabling/disabling a userJoas Schilling2017-04-252-0/+18
| |_|_|/ / |/| | | |
* | | | | Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletionJoas Schilling2017-04-252-0/+35
|\ \ \ \ \
| * | | | | 4190Roger Szabo2017-04-252-0/+35
| |/ / / /
* | | | | Merge pull request #3531 from nextcloud/theming-scssMorris Jobke2017-04-255-709/+328
|\ \ \ \ \
| * | | | | Mock itJoas Schilling2017-04-251-12/+39
| * | | | | Logo and background URLs must be relativeJoas Schilling2017-04-252-11/+8
| * | | | | Fix theming testsJulius Härtl2017-04-252-30/+13
| * | | | | Implement scss variable injection by OC_DefaultsJulius Haertl2017-04-255-681/+293
| |/ / / /
* / / / / Fix invalid characterJoas Schilling2017-04-252-2/+2
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-2516-20/+30
* | | | Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casingMorris Jobke2017-04-242-84/+92
|\ \ \ \
| * | | | Remove dead argumentsJoas Schilling2017-04-242-45/+1