summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-06-1256-2/+158
* Merge pull request #9473 from nextcloud/dav-upload-no-partfile-lockMorris Jobke2018-06-111-15/+23
|\
| * properly lock the target file on dav upload when not using part filesRobin Appelman2018-06-111-15/+23
|/
* Merge pull request #9558 from nextcloud/fix/9489/trashbin_previewsMorris Jobke2018-06-115-55/+73
|\
| * Previews on for all trashbin filesRoeland Jago Douma2018-06-055-55/+73
* | Merge pull request #9814 from nextcloud/bugfix/6032/delete_group_with_slashMorris Jobke2018-06-111-1/+1
|\ \
| * | Make the DELETION of groups match greedy on the groupIDRoeland Jago Douma2018-06-091-1/+1
* | | Merge pull request #9810 from nextcloud/tests/9769/apps-management-acceptanceJohn Molakvoæ2018-06-1110-5/+354
|\ \ \
| * | | Update asettings bundled javascriptJulius Härtl2018-06-092-2/+2
| * | | Add key and fix disabled apps listingJulius Härtl2018-06-091-2/+2
| * | | Properly check for the sidebarJulius Härtl2018-06-092-3/+26
| * | | Add category field to apps that are only known from the app storeJulius Härtl2018-06-091-0/+1
| * | | Add basic acceptance tests for apps managementJulius Härtl2018-06-096-1/+326
* | | | Merge pull request #9807 from nextcloud/fix-highlighting-of-the-upload-drop-zoneJohn Molakvoæ2018-06-112-16/+36
|\ \ \ \
| * | | | Do not show an error message when draging and dropping textDaniel Calviño Sánchez2018-06-081-0/+10
| * | | | Remove no longer needed special handling for FirefoxDaniel Calviño Sánchez2018-06-081-15/+8
| * | | | Use "dropnofiles" callback to disable the drop state in the UIDaniel Calviño Sánchez2018-06-081-0/+10
| * | | | Add callback to clean up after misbehaved drag and drop eventsDaniel Calviño Sánchez2018-06-081-0/+12
| * | | | Remove duplicated codeDaniel Calviño Sánchez2018-06-081-6/+1
* | | | | Merge pull request #9798 from nextcloud/bugfix/noid/enable_caldav_for_public_...Morris Jobke2018-06-111-1/+1
|\ \ \ \ \
| * | | | | enable caldav for webdav subtree public-calendarsGeorg Ehrke2018-06-081-1/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-116-0/+18
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-1010-4/+32
| |_|_|/ / |/| | | |
* | | | | Merge pull request #9802 from nextcloud/bugfix/noid/token_check_expire_betterMorris Jobke2018-06-091-1/+1
|\ \ \ \ \
| * | | | | Make the token expiration also work for autocasting 0Roeland Jago Douma2018-06-081-1/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-0932-0/+108
* | | | | | Merge pull request #9793 from nextcloud/fix-mention-regexJohn Molakvoæ2018-06-082-3/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add another testMario Danic2018-06-081-1/+3
| * | | | | Add a new regex testMario Danic2018-06-081-1/+3
| * | | | | New regex to match mentionsMario Danic2018-06-081-1/+1
| * | | | | Remove unsupported modifierMario Danic2018-06-081-1/+1
| * | | | | Fix mentions regexMario Danic2018-06-081-1/+1
* | | | | | Merge pull request #9796 from nextcloud/dependabot/npm_and_yarn/apps/updateno...John Molakvoæ2018-06-082-133/+132
|\ \ \ \ \ \
| * | | | | | Bump webpack from 4.11.1 to 4.12.0 in /apps/updatenotificationdependabot[bot]2018-06-082-133/+132
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #9797 from nextcloud/dependabot/npm_and_yarn/settings/webp...John Molakvoæ2018-06-082-118/+117
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump webpack from 4.11.1 to 4.12.0 in /settingsdependabot[bot]2018-06-082-118/+117
|/ / / / /
* | | | | Merge pull request #9786 from nextcloud/feature/noid/external_sftp_password_a...Morris Jobke2018-06-084-7/+85
|\ \ \ \ \
| * | | | | Add SFTP auth mechanism to use a password and public key for SFTPRoeland Jago Douma2018-06-074-7/+85
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-08276-11600/+11754
| |/ / / / |/| | | |
* | | | | Merge pull request #9787 from nextcloud/notify-credentials-envMorris Jobke2018-06-071-0/+8
|\ \ \ \ \
| * | | | | allow setting notify credentials in environmentRobin Appelman2018-06-071-0/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #9772 from nextcloud/feature/8123/same_site_cookie_config_phpMorris Jobke2018-06-072-5/+24
|\ \ \ \ \
| * | | | | Add warningRoeland Jago Douma2018-06-061-0/+2
| * | | | | Configurable list for opt out from same site cookie protectionjaltek2018-06-062-5/+22
* | | | | | Merge pull request #9783 from nextcloud/3rdparty/noid/kill_cssminMorris Jobke2018-06-071-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [3rdparty] Kill CssMinRoeland Jago Douma2018-06-071-0/+0
|/ / / / /
* | | | | Merge pull request #9616 from nextcloud/zero-quota-fixJohn Molakvoæ2018-06-0710-20/+29
|\ \ \ \ \
| * | | | | Make sure initial files can be properly createdRoeland Jago Douma2018-06-071-1/+2
| * | | | | Allow 0 quota by provisioning apiJohn Molakvoæ (skjnldsv)2018-06-079-19/+27
* | | | | | Merge pull request #9775 from nextcloud/3rdparty/noid/bump_patchwork_utf8John Molakvoæ2018-06-071-0/+0
|\ \ \ \ \ \