mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
48,071 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

48071 Commits

Author SHA1 Message Date
Roeland Jago Douma dbd0bd6b3f
Merge pull request #13954 from nextcloud/bugfix/noid/show-original-location-in-trashbin 
Show original path in trashbin
 2019-02-05 14:08:37 +01:00
Roeland Jago Douma 3d33703ed9
Merge pull request #14024 from nextcloud/fix/installation 
It is getURLParameter not getUrlParameter
 2019-02-05 13:46:20 +01:00
Roeland Jago Douma 31a1eb0c1f
It is getURLParameter not getUrlParameter 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-05 13:15:23 +01:00
Morris Jobke 0bb55f4ed3
Merge pull request #14015 from nextcloud/fix/no_need_to_load_bundle_deps 
No need to explicitly load bundle dependencies
 2019-02-05 10:23:21 +01:00
Morris Jobke 979cf79555
Show original path in trashbin via extraData 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-05 09:36:21 +01:00
Roeland Jago Douma a201f2b4d0
No need to explicitly load bundle dependencies 
oc-webdav-backbone is loaded by default

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-04 19:34:51 +01:00
Roeland Jago Douma 733515f277
Merge pull request #14006 from nextcloud/enh/contactsmenu_templates_to_bundle 
Move contactmenu handlebars templates to bundle
 2019-02-04 11:29:16 +01:00
Roeland Jago Douma 1b27c25dce
Remove from build file 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-04 10:56:54 +01:00
Roeland Jago Douma a498b72dec
Move the contactsmenu handlebars templates to the bundle 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-04 10:56:52 +01:00
Roeland Jago Douma a242ec695a
Merge pull request #13877 from IGLOU-EU/master 
SCSS: add background on app section:hover
 2019-02-04 08:53:37 +01:00
Roeland Jago Douma f705ffcfab
Merge pull request #13989 from nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-1.16.4 
Bump css-vars-ponyfill from 1.16.3 to 1.16.4
 2019-02-04 08:17:46 +01:00
Roeland Jago Douma 3372459c8b
Merge pull request #13988 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/nextcloud-vue-0.6.1 
Bump nextcloud-vue from 0.6.0 to 0.6.1 in /apps/updatenotification
 2019-02-04 08:17:22 +01:00
dependabot[bot] e7cb87832d
Bump nextcloud-vue from 0.6.0 to 0.6.1 in /apps/updatenotification 
Bumps [nextcloud-vue](https://github.com/nextcloud/nextcloud-vue) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/nextcloud/nextcloud-vue/releases)
- [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v0.6.0...v0.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-03 13:59:59 +01:00
dependabot[bot] 5818e0bcbe
Bump css-vars-ponyfill from 1.16.3 to 1.16.4 
Bumps [css-vars-ponyfill](https://github.com/jhildenbiddle/css-vars-ponyfill) from 1.16.3 to 1.16.4.
- [Release notes](https://github.com/jhildenbiddle/css-vars-ponyfill/releases)
- [Changelog](https://github.com/jhildenbiddle/css-vars-ponyfill/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhildenbiddle/css-vars-ponyfill/compare/v1.16.3...v1.16.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-03 13:56:50 +01:00
Iglou.eu 4389b80640
inadvertent error prevention on .row 
Add a 5px border on .row settings section
 2019-02-01 21:14:06 +01:00
Morris Jobke 422dd9dfd6
Merge pull request #11304 from andyg5000/master 
Make the data year in the template dynamic by using date().
 2019-02-01 15:49:18 +01:00
Morris Jobke e5d8645f00
Merge pull request #13846 from nextcloud/feature/check-if-app-exist-for-group 
Check app path for enableAppForGroups
 2019-02-01 15:23:01 +01:00
splitt3r 42eb1538ef
Update dynamic year in example theme 2019-02-01 15:07:36 +01:00
andyg5000 c55643d8d7
Make the data year in the template dynamic by using date(). 2019-02-01 15:07:36 +01:00
Roeland Jago Douma ba03c1a84c
Merge pull request #13548 from nextcloud/feature/10964/app_tokens_activity 
Publish event for app token create/update/delete
 2019-02-01 14:56:45 +01:00
Joas Schilling e780303ee7
Make strict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-01 13:18:52 +01:00
Joas Schilling 09642da8cc
Use rich object subjects 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-01 13:15:59 +01:00
Roeland Jago Douma b249c16506
Merge pull request #13796 from nextcloud/design/settings-caldav 
Move calendar settings into basic settings
 2019-02-01 13:00:44 +01:00
Morris Jobke 6d35597999
Merge pull request #13970 from nextcloud/fix/do_not_try_to_load_removed_files 
Do not try to load js moved to bundle
 2019-02-01 12:16:59 +01:00
Roeland Jago Douma af62b963c7
Merge pull request #13972 from nextcloud/backport/13947/master 
[master] trim filename in webfrontend for windows compatibility
 2019-02-01 12:09:54 +01:00
Roeland Jago Douma 23245904d3
Merge pull request #13694 from b108/duplicate-functionality-in-request-class 
Remove duplicate functionality
 2019-02-01 11:28:25 +01:00
Christian Aigner ce37930910 HBOX-297 trim in webfrontend for new files to stay compatible with windows 2019-02-01 09:47:07 +00:00
Roeland Jago Douma f1b0332920
Do not try to load js moved to bundle 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-01 10:39:47 +01:00
Morris Jobke 5fe151f7c4
Merge pull request #13927 from nextcloud/remove-dead-code 
Don't call apc_delete_file and apc_clear_cache anymore
 2019-02-01 10:17:55 +01:00
Morris Jobke 0d22ea71d8
Merge pull request #12090 from nextcloud/aastha/11923 
Add title attribute for app navigation items.
 2019-02-01 10:14:42 +01:00
Georg Ehrke ea1f6f6aef
make text in Groupware Settings translateable 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-02-01 10:06:32 +01:00
Georg Ehrke 6c49dd169b
fix link to Calendar app in Groupware page 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-02-01 10:06:32 +01:00
Georg Ehrke 9cea139634
Turn "email server" in groupware settings to link to mail settings 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-02-01 10:06:31 +01:00
Jan-Christoph Borchardt 3508c2368f
Keep Calendar server settings in groupware but link mail server settings 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-02-01 10:06:31 +01:00
Jan-Christoph Borchardt 280dce8dbc
Calendar server: Link Calendar app and calendar sync docs 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-02-01 10:06:31 +01:00
Jan-Christoph Borchardt c44c23a1c3
Improve design of description below label of checkbox or radio button 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-02-01 10:06:31 +01:00
Jan-Christoph Borchardt b068809d9f
Move calendar settings into basic settings 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-02-01 10:06:28 +01:00
Morris Jobke e7fafa6b15
Merge pull request #13960 from nextcloud/refactor/global-helpers-bundle 
Move global helper functions to the bundle and deprecate some of them
 2019-02-01 09:32:10 +01:00
Morris Jobke 30fb78c878
Merge pull request #12917 from nextcloud/feature/noid/favorites-quickaccess-add-droppable-v3 
Added Drozone to favorites quickaccess
 2019-02-01 09:30:42 +01:00
Christoph Wurst ab73c9c328
Move global helper functions to the bundle and deprecate some of them 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 09:15:30 +01:00
Morris Jobke 8709f6b218
Merge pull request #13957 from nextcloud/refactor/oc-search-passwordconfirm-util 
Move OC.Search, OC.PasswordConfirmation and OC.Util to the server bundle
 2019-02-01 09:09:41 +01:00
Morris Jobke 4a3fe2655f
Merge pull request #13261 from nextcloud/fix/12395 
only show "Add to your Nextcloud" on share link if federation is acti…
 2019-02-01 09:09:02 +01:00
Christoph Wurst 799a0fbb78
Make chunkify an internal function to prevent context errors 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 08:51:46 +01:00
Roeland Jago Douma f77c3fcf89
Merge pull request #13932 from filisko/master 
Comment fix.
 2019-02-01 08:46:48 +01:00
Christoph Wurst 0d43ef06f5
Add OC.Util to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 08:25:01 +01:00
Christoph Wurst 9de02d3267
Move OC.PasswordConfirmation to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 08:24:13 +01:00
Christoph Wurst dbfa8b65a1
Move OC.search to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 08:22:49 +01:00
Roeland Jago Douma dc3b44c02d
Merge pull request #13956 from nextcloud/refactor/oc-plugins-msg-notifications-II 
Move OC.Plugins, OC.msg and OC.Notification to the server bundle
 2019-02-01 08:20:03 +01:00
Christoph Wurst 3d1a3b6644
Move OC.Plugin to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 07:58:07 +01:00
Christoph Wurst 4846aea951
Move OC.msg to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 07:56:38 +01:00