summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12364 from tomasz-grobelny/file_range_selectJohn Molakvoæ2019-01-304-26/+124
|\
| * Add more accessible method of selecting file rangesTomasz Grobelny2019-01-244-26/+124
* | Merge pull request #13237 from rcdailey/nfs-write-checksRoeland Jago Douma2019-01-301-7/+15
|\ \
| * | Improve data directory write checking for NFS mountsRobert Dailey2019-01-241-7/+15
* | | Merge pull request #13752 from rummatee/issue7629Roeland Jago Douma2019-01-301-0/+1
|\ \ \
| * | | fix opacity for add-new-folder buttonFlorian Schunk2019-01-231-0/+1
* | | | Merge pull request #13830 from nextcloud/fix/shared_versionsRoeland Jago Douma2019-01-301-2/+15
|\ \ \ \
| * | | | Allow shared versions again in legacy backendRoeland Jago Douma2019-01-251-2/+15
* | | | | Merge pull request #13897 from nextcloud/fix-updating-the-password-of-a-link-...Roeland Jago Douma2019-01-305-45/+36
|\ \ \ \ \
| * | | | | Fix updating the password of a link share when passwords are enforcedDaniel Calviño Sánchez2019-01-295-45/+36
* | | | | | Merge pull request #13886 from nextcloud/trashbin-original-location-fallbackRoeland Jago Douma2019-01-301-1/+5
|\ \ \ \ \ \
| * | | | | | add fallback for trashbin original locationRobin Appelman2019-01-291-1/+5
* | | | | | | Merge pull request #13646 from nextcloud/enh/13488/initialstateRoeland Jago Douma2019-01-3020-21/+223
|\ \ \ \ \ \ \
| * | | | | | | Provide initial stateRoeland Jago Douma2019-01-2920-21/+223
|/ / / / / / /
* | | | | | | Merge pull request #13880 from nextcloud/enh/expose_subadmin_to_ocpRoeland Jago Douma2019-01-2910-135/+156
|\ \ \ \ \ \ \
| * | | | | | | Expose subadmin to OCPRoeland Jago Douma2019-01-2910-135/+156
* | | | | | | | Merge pull request #13881 from nextcloud/refactor/jquery-plugins-bundleRoeland Jago Douma2019-01-2926-1047/+1449
|\ \ \ \ \ \ \ \
| * | | | | | | | Move jQuery plugins into modules and add them to the bundleChristoph Wurst2019-01-2926-1047/+1449
* | | | | | | | | Merge pull request #13869 from nextcloud/enh/clean_pending_2fa_session_on_pas...Roeland Jago Douma2019-01-293-3/+23
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Clean pending 2FA authentication on password resetRoeland Jago Douma2019-01-293-3/+23
* | | | | | | | | Merge pull request #13883 from nextcloud/fix-dropping-a-folder-on-a-folder-rowRoeland Jago Douma2019-01-291-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fix dropping a folder on a folder rowDaniel Calviño Sánchez2019-01-291-1/+3
* | | | | | | | | Merge pull request #13865 from nextcloud/fix/noid/ldap-pagedsearch-multiplebasesMorris Jobke2019-01-294-7/+52
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | iterate over bases instead of doing parallel searchArthur Schiwon2019-01-281-5/+28
| * | | | | | | | | integration test: pages search scenario with multiple basesArthur Schiwon2019-01-282-1/+23
| * | | | | | | | | typoArthur Schiwon2019-01-281-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13843 from nextcloud/bugfix/11852-add-icon-caldavMorris Jobke2019-01-291-32/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use proper mime type for icoDaniel Kesselberg2019-01-281-1/+1
| * | | | | | | | | Add ico as avatarDaniel Kesselberg2019-01-281-32/+32
* | | | | | | | | | Merge pull request #13866 from nextcloud/s3-multipart-uploaderRoeland Jago Douma2019-01-292-5/+33
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | always use multipart uploader for s3 uploadsRobin Appelman2019-01-282-5/+33
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13878 from nextcloud/refactor/oc-appconfig-eventsource-l10nMorris Jobke2019-01-299-92/+130
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move OC.L10n to the server bundleChristoph Wurst2019-01-297-36/+44
| * | | | | | | | | Move OC.EventSource to the server bundleChristoph Wurst2019-01-296-56/+60
| * | | | | | | | | Move OC.AppConfig to the server bundle and add a deprecation verionChristoph Wurst2019-01-296-14/+40
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #10874 from nextcloud/feature/10859/clear-localstorage-on-...John Molakvoæ2019-01-292-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clears the local storage after logoutMichael Weimann2019-01-292-1/+10
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13791 from nextcloud/no-whiteversion-for-shadowed-iconsJohn Molakvoæ2019-01-291-5/+18
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Do not generate dark version of the view-icons w/ shadowsJohn Molakvoæ (skjnldsv)2019-01-241-5/+18
* | | | | | | | | Merge pull request #13870 from nextcloud/refactor/oc-contactsmenu-bundleRoeland Jago Douma2019-01-2910-876/+879
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move OC.Contactsmenu and OC.Backbone to the server bundleChristoph Wurst2019-01-2910-876/+879
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13855 from tomasz-grobelny/faster_file_uploadChristoph Wurst2019-01-292-1/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Throttle getstoragestats.php calls and allow simultaneous uploadsTomasz Grobelny2019-01-272-1/+6
* | | | | | | | | Merge pull request #13867 from nextcloud/refactor/oc-apps-bundleMorris Jobke2019-01-2810-142/+163
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move OCA.Apps to the server bundleChristoph Wurst2019-01-2810-142/+163
* | | | | | | | | | Merge pull request #5881 from nextcloud/command-move-calendarMorris Jobke2019-01-289-0/+899
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Handle moving calendar to an user who already has the shareThomas Citharel2019-01-164-51/+134
| * | | | | | | | | Don't check group shares if shareWithGroupMembersOnly is falseThomas Citharel2019-01-162-29/+48
| * | | | | | | | | add list-calendars commandGeorg Ehrke2019-01-168-66/+519
| * | | | | | | | | Add command to move a calendar from an user to anotherThomas Citharel2019-01-165-0/+344