summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2058 from nextcloud/better-error-message-for-installation...Morris Jobke2016-11-092-4/+20
|\
| * Correctly catch the "soft errors" nowJoas Schilling2016-11-091-4/+8
| * Use a better error message and point the users to the support channelsJoas Schilling2016-11-092-1/+13
* | Merge pull request #2052 from nextcloud/ros-definitions-as-php-classMorris Jobke2016-11-098-265/+425
|\ \
| * | Add test and adjust PHP function argumentsLukas Reschke2016-11-092-1/+10
| * | Add tests for validity of the definitionsJoas Schilling2016-11-091-0/+84
| * | Use a php class for the definitions to avoid loading problemsJoas Schilling2016-11-097-265/+332
| |/
* | Merge pull request #1792 from nextcloud/bump_sabreRoeland Jago Douma2016-11-0925-120/+375
|\ \
| * | Adjust third-party refLukas Reschke2016-11-091-0/+0
| * | Add testsLukas Reschke2016-11-092-0/+143
| * | Fix CalendarTestRoeland Jago Douma2016-11-042-1/+25
| * | Fix pluginRoeland Jago Douma2016-11-042-1/+43
| * | Minor fixesRoeland Jago Douma2016-11-043-5/+5
| * | Fix testsRoeland Jago Douma2016-11-042-2/+2
| * | [3rdparty] Bump sabre/dav to 3.2Roeland Jago Douma2016-11-041-0/+0
| * | Update sabre dav to 3.2 (#26115)Thomas Müller2016-11-0419-112/+158
* | | Merge pull request #2055 from nextcloud/js-codecovLukas Reschke2016-11-092-1/+5
|\ \ \ | |_|/ |/| |
| * | Generate js codecov coverageRoeland Jago Douma2016-11-092-1/+5
|/ /
* | Merge pull request #2053 from nextcloud/make-sure-we-can-backup-the-command-busMorris Jobke2016-11-081-4/+4
|\ \
| * | Make sure the database is not replaced while we make a backup of the serviceJoas Schilling2016-11-081-4/+4
* | | Merge pull request #2037 from nextcloud/fix-preview-urlsRoeland Jago Douma2016-11-081-2/+2
|\ \ \
| * | | Fix preview URLsJoas Schilling2016-11-081-2/+2
* | | | Merge pull request #1998 from nextcloud/share-by-mail-notificationBjörn Schießle2016-11-0810-58/+543
|\ \ \ \ | |/ / / |/| | |
| * | | Fix some typosJoas Schilling2016-11-081-2/+2
| * | | add activity if a file was shared by mailBjoern Schiessle2016-11-087-13/+420
| * | | add new definitionBjoern Schiessle2016-11-081-0/+19
| * | | add activity for share by mailBjoern Schiessle2016-11-083-45/+104
* | | | Merge pull request #1618 from nextcloud/show-folder-shared-statusMorris Jobke2016-11-0810-22/+440
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix styling of the breadcrumbs iconMorris Jobke2016-11-082-3/+6
| * | | fix share icon position and remove debug logChristoph Wurst2016-11-082-2/+0
| * | | Add testsRoeland Jago Douma2016-11-071-0/+224
| * | | Show link icon when shared by linkRoeland Jago Douma2016-11-071-13/+12
| * | | Actually update the stateRoeland Jago Douma2016-11-071-1/+19
| * | | detail fixes for share current folderJan-Christoph Borchardt2016-11-072-3/+1
| * | | Listen to sharetab changesRoeland Jago Douma2016-11-072-1/+12
| * | | update breadcrumb view whenever the share information on the directory info m...Christoph Wurst2016-11-072-7/+15
| * | | the root folder must not be sharedChristoph Wurst2016-11-071-6/+11
| * | | visually reflect sharing state of current folderChristoph Wurst2016-11-074-6/+39
| * | | refactor share permission logic into own method to reuse it for the share tabChristoph Wurst2016-11-073-14/+27
| * | | let users share the curren folderChristoph Wurst2016-11-072-4/+19
| * | | show whether the current folder was shared or notChristoph Wurst2016-11-075-0/+93
* | | | Merge pull request #2047 from nextcloud/update-containersChristoph Wurst2016-11-081-39/+39
|\ \ \ \
| * | | | Update containers to latest versionMorris Jobke2016-11-081-39/+39
* | | | | Merge pull request #2038 from nextcloud/js_testsMorris Jobke2016-11-081-7/+7
|\ \ \ \ \
| * | | | | Bump jstests depsRoeland Jago Douma2016-11-081-7/+7
|/ / / / /
* | | | | Merge pull request #2040 from nextcloud/firefox-svg-workaround-fixMorris Jobke2016-11-081-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Apply firefox workaroud to svg filtersJulius Haertl2016-11-081-1/+3
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2016-11-08112-170/+174
|/ / /
* | | Merge pull request #2036 from nextcloud/try-fixing-firefox-push-stateRoeland Jago Douma2016-11-071-1/+1
|\ \ \
| * | | Fix the push stateJoas Schilling2016-11-071-1/+1