summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2055 from nextcloud/js-codecovLukas Reschke2016-11-092-1/+5
|\ | | | | Javascript code coverage
| * Generate js codecov coverageRoeland Jago Douma2016-11-092-1/+5
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* 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 …
| * Make sure the database is not replaced while we make a backup of the serviceJoas Schilling2016-11-081-4/+4
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2037 from nextcloud/fix-preview-urlsRoeland Jago Douma2016-11-081-2/+2
|\ \ | | | | | | Fix preview URLs
| * | Fix preview URLsJoas Schilling2016-11-081-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1998 from nextcloud/share-by-mail-notificationBjörn Schießle2016-11-0810-58/+543
|\ \ \ | |/ / |/| | add share by mail activity
| * | Fix some typosJoas Schilling2016-11-081-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | add activity if a file was shared by mailBjoern Schiessle2016-11-087-13/+420
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add new definitionBjoern Schiessle2016-11-081-0/+19
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add activity for share by mailBjoern Schiessle2016-11-083-45/+104
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #1618 from nextcloud/show-folder-shared-statusMorris Jobke2016-11-0810-22/+440
|\ \ \ | |_|/ |/| | make it possible to share the current folder
| * | Fix styling of the breadcrumbs iconMorris Jobke2016-11-082-3/+6
| | | | | | | | | | | | | | | | | | | | | * properly center share icon * also apply styles for public share icon Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | fix share icon position and remove debug logChristoph Wurst2016-11-082-2/+0
| | |
| * | Add testsRoeland Jago Douma2016-11-071-0/+224
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Show link icon when shared by linkRoeland Jago Douma2016-11-071-13/+12
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Actually update the stateRoeland Jago Douma2016-11-071-1/+19
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | detail fixes for share current folderJan-Christoph Borchardt2016-11-072-3/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Listen to sharetab changesRoeland Jago Douma2016-11-072-1/+12
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | update breadcrumb view whenever the share information on the directory info ↵Christoph Wurst2016-11-072-7/+15
| | | | | | | | | | | | | | | | | | model changes Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | the root folder must not be sharedChristoph Wurst2016-11-071-6/+11
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | visually reflect sharing state of current folderChristoph Wurst2016-11-074-6/+39
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | refactor share permission logic into own method to reuse it for the share tabChristoph Wurst2016-11-073-14/+27
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | let users share the curren folderChristoph Wurst2016-11-072-4/+19
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | show whether the current folder was shared or notChristoph Wurst2016-11-075-0/+93
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #2047 from nextcloud/update-containersChristoph Wurst2016-11-081-39/+39
|\ \ \ | | | | | | | | Update containers to latest version
| * | | Update containers to latest versionMorris Jobke2016-11-081-39/+39
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #2038 from nextcloud/js_testsMorris Jobke2016-11-081-7/+7
|\ \ \ \ | | | | | | | | | | Bump jstests deps
| * | | | Bump jstests depsRoeland Jago Douma2016-11-081-7/+7
|/ / / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #2040 from nextcloud/firefox-svg-workaround-fixMorris Jobke2016-11-081-1/+3
|\ \ \ \ | |/ / / |/| | | Apply firefox workaroud to svg filters
| * | | Apply firefox workaroud to svg filtersJulius Haertl2016-11-081-1/+3
| |/ / | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* / / [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 state
| * | Fix the push stateJoas Schilling2016-11-071-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2034 from nextcloud/product-typoRoeland Jago Douma2016-11-071-1/+1
|\ \ \ | |/ / |/| | Fix translation string
| * | Fix translation stringJoas Schilling2016-11-071-1/+1
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2026 from nextcloud/setting_langMorris Jobke2016-11-075-56/+219
|\ \ | | | | | | Move setlanguage to controller
| * | Fix route and jsRoeland Jago Douma2016-11-063-56/+11
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add settings PersonalControllerRoeland Jago Douma2016-11-062-0/+208
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2032 from nextcloud/noodlesegg-refactorRoeland Jago Douma2016-11-072-10/+5
|\ \ \ | | | | | | | | refactoring code to reduce cyclomatic complexit
| * | | refactoring code to reduce cyclomatic complexitDonquixote2016-11-072-10/+5
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2016-11-0738-48/+306
| | |
* | | [tx-robot] updated from transifexNextcloud bot2016-11-0616-0/+196
|/ /
* | Merge pull request #2018 from nextcloud/firefox-svg-workaroundMorris Jobke2016-11-051-0/+11
|\ \ | | | | | | Workaround for disappearing app icons for Firefox before version 51
| * | Workaround for disappearing app icons for Firefox before version 51Julius Haertl2016-11-041-0/+11
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | Merge pull request #2021 from henrymohn/bug-1875_Password-HintMorris Jobke2016-11-051-11/+10
|\ \ \ | | | | | | | | Removed else statement preventing Success message from displaying cau…
| * | | Removed else statement preventing Success message from displaying causing ↵Henry Mohn2016-11-041-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | bug #1875 Signed-off-by: Henry Mohn <hmohniii@gmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-0528-38/+360
| | | |
* | | | Merge pull request #2014 from nextcloud/cleanup_oc_group_a_tadRoeland Jago Douma2016-11-043-231/+269
|\ \ \ \ | | | | | | | | | | Cleanup OC_Group usage a bit
| * | | | Cleanup OC_Group usage a bitRoeland Jago Douma2016-11-043-231/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is deprecated internal stuff. Should not be used anymore. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>