Merge 8d040cb into 88fb047

nextcloud · Aug 16, 2018 · 7b967fe · 7b967fe
2 parents 88fb047 + 8d040cb
commit 7b967fe
Show file tree

Hide file tree

Showing 355 changed files with 22 additions and 9 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitignore b/.gitignore
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/.tx/config b/.tx/config
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/COPYING b/COPYING
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/appinfo/app.php b/appinfo/app.php
diff --git a/appinfo/application.php b/appinfo/application.php
diff --git a/appinfo/info.xml b/appinfo/info.xml
diff --git a/appinfo/routes.php b/appinfo/routes.php
diff --git a/composer.json b/composer.json
diff --git a/controller/contactcontroller.php b/controller/contactcontroller.php
diff --git a/controller/emailcontroller.php b/controller/emailcontroller.php
diff --git a/controller/proxycontroller.php b/controller/proxycontroller.php
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
diff --git a/controller/viewcontroller.php b/controller/viewcontroller.php
diff --git a/css/app/calendar.scss b/css/app/calendar.scss
diff --git a/css/app/calendarlist.scss b/css/app/calendarlist.scss
diff --git a/css/app/datepicker.scss b/css/app/datepicker.scss
diff --git a/css/app/eventdialog.scss b/css/app/eventdialog.scss
diff --git a/css/app/globals.scss b/css/app/globals.scss
diff --git a/css/app/print.scss b/css/app/print.scss
diff --git a/css/app/settings.scss b/css/app/settings.scss
diff --git a/http/streamresponse.php b/http/streamresponse.php
diff --git a/img/calendar.png b/img/calendar.png
diff --git a/img/calendar.svg b/img/calendar.svg
diff --git a/img/color_picker.svg b/img/color_picker.svg
diff --git a/img/embed.svg b/img/embed.svg
diff --git a/img/favicon-mask.svg b/img/favicon-mask.svg
diff --git a/img/favicon-touch.png b/img/favicon-touch.png
diff --git a/img/favicon-touch.svg b/img/favicon-touch.svg
diff --git a/img/favicon.ico b/img/favicon.ico
diff --git a/img/favicon.png b/img/favicon.png
diff --git a/img/favicon.svg b/img/favicon.svg
diff --git a/img/leftarrow.svg b/img/leftarrow.svg
diff --git a/img/loading.gif b/img/loading.gif
diff --git a/img/random.svg b/img/random.svg
diff --git a/img/rightarrow.svg b/img/rightarrow.svg
diff --git a/img/timezone.svg b/img/timezone.svg
diff --git a/issue_template.md b/issue_template.md
diff --git a/js/.jshintrc b/js/.jshintrc
diff --git a/js/.stylelintrc b/js/.stylelintrc
diff --git a/js/app/controllers/attendeecontroller.js b/js/app/controllers/attendeecontroller.js
diff --git a/js/app/controllers/calcontroller.js b/js/app/controllers/calcontroller.js
@@ -132,6 +132,7 @@ app.controller('CalController', ['$scope', 'Calendar', 'CalendarService', 'VEven
 			fc.elm.fullCalendar('option', 'timezone', 'UTC');
 		});
 
+
 		if (!isPublic) {
 			$scope.calendarsPromise = CalendarService.getAll().then(function (calendars) {
 				$scope.calendars = calendars;
@@ -140,17 +141,33 @@ app.controller('CalController', ['$scope', 'Calendar', 'CalendarService', 'VEven
 				$scope.$apply();
 			});
 		} else {
-			$scope.calendarsPromise = CalendarService.getPublicCalendar(constants.publicSharingToken).then(function(calendar) {
-				$scope.calendars = [calendar];
+			$scope.calendars = [];
+			var tokens = constants.publicSharingToken.split(".");
+			var promises = [];
+
+			tokens.forEach(function(token){
+				promises.push(CalendarService.getPublicCalendar(token).then(function(calendar) {
+					$scope.calendars.push(calendar);
+				}).catch((reason => {
+					OC.Notification.showTemporary(t('calendar', 'Calendar does not exist'));
+				})));
+			});
+
+			$scope.calendarsPromise = Promise.all(promises).then().catch().then(() => {
 				is.loading = false;
 				// TODO - scope.apply should not be necessary here
+				if($scope.calendars.length===0){
+					angular.element('#header-right').css('display', 'none');
+					angular.element('#emptycontent-container').css('display', 'block');
+				}
 				$scope.$apply();
-			}).catch((reason) => {
-				angular.element('#header-right').css('display', 'none');
-				angular.element('#emptycontent-container').css('display', 'block');
 			});
 		}
 
+		$scope.integration = function () {
+			return '<iframe width="400" height="215" src="' + $scope.$parent.root + 'embed/' + constants.publicSharingToken + '"></iframe>';
+		};
+
 
 		/**
 		 * Calendar UI Configuration.

diff --git a/js/app/controllers/calendarlistcontroller.js b/js/app/controllers/calendarlistcontroller.js
@@ -151,10 +151,6 @@ app.controller('CalendarListController', ['$scope', '$rootScope', '$window', 'Ha
 			$window.open(item.calendar.downloadUrl);
 		};
 
-		$scope.integration = function (item) {
-			return '<iframe width="400" height="215" src="' + item.publicEmbedURL + '"></iframe>';
-		};
-
 		$scope.$watch('publicdav', function (newvalue) {
 			if ($scope.$parent.calendars[0]) {
 				if (newvalue === 'CalDAV') { // CalDAV address

diff --git a/js/app/controllers/datepickercontroller.js b/js/app/controllers/datepickercontroller.js
diff --git a/js/app/controllers/editorcontroller.js b/js/app/controllers/editorcontroller.js
diff --git a/js/app/controllers/importcontroller.js b/js/app/controllers/importcontroller.js
diff --git a/js/app/controllers/recurrencecontroller.js b/js/app/controllers/recurrencecontroller.js
diff --git a/js/app/controllers/settingscontroller.js b/js/app/controllers/settingscontroller.js
diff --git a/js/app/controllers/valarmcontroller.js b/js/app/controllers/valarmcontroller.js
diff --git a/js/app/directives/avatarDirective.js b/js/app/directives/avatarDirective.js
diff --git a/js/app/directives/colorpickerDirective.js b/js/app/directives/colorpickerDirective.js
diff --git a/js/app/directives/confirmationDirective.js b/js/app/directives/confirmationDirective.js
diff --git a/js/app/directives/datetimepickerDirective.js b/js/app/directives/datetimepickerDirective.js
diff --git a/js/app/directives/fullCalendarDirective.js b/js/app/directives/fullCalendarDirective.js
diff --git a/js/app/directives/loadingDirective.js b/js/app/directives/loadingDirective.js
diff --git a/js/app/directives/modalDirective.js b/js/app/directives/modalDirective.js
diff --git a/js/app/directives/onToggleShowDirective.js b/js/app/directives/onToggleShowDirective.js
diff --git a/js/app/factory/calendarFactory.js b/js/app/factory/calendarFactory.js
diff --git a/js/app/factory/icalFactory.js b/js/app/factory/icalFactory.js
diff --git a/js/app/filters/CalendarListFilter.js b/js/app/filters/CalendarListFilter.js
diff --git a/js/app/filters/SubscriptionListFilter.js b/js/app/filters/SubscriptionListFilter.js
diff --git a/js/app/filters/attendeefilter.js b/js/app/filters/attendeefilter.js
diff --git a/js/app/filters/attendeenotorganizerfilter.js b/js/app/filters/attendeenotorganizerfilter.js
diff --git a/js/app/filters/calendarfilter.js b/js/app/filters/calendarfilter.js
diff --git a/js/app/filters/calendarselectorfilter.js b/js/app/filters/calendarselectorfilter.js
diff --git a/js/app/filters/datepickerfilter.js b/js/app/filters/datepickerfilter.js
diff --git a/js/app/filters/importcalendarfilter.js b/js/app/filters/importcalendarfilter.js
diff --git a/js/app/filters/importerrorfilter.js b/js/app/filters/importerrorfilter.js
diff --git a/js/app/filters/reminderfilter.js b/js/app/filters/reminderfilter.js
diff --git a/js/app/filters/subscriptionfilter.js b/js/app/filters/subscriptionfilter.js
diff --git a/js/app/filters/timezonefilter.js b/js/app/filters/timezonefilter.js
diff --git a/js/app/filters/timezonewithoutcontinentfilter.js b/js/app/filters/timezonewithoutcontinentfilter.js
diff --git a/js/app/models/ImportFileWrapperModel.js b/js/app/models/ImportFileWrapperModel.js
diff --git a/js/app/models/calendarListItemModel.js b/js/app/models/calendarListItemModel.js
diff --git a/js/app/models/calendarmodel.js b/js/app/models/calendarmodel.js
diff --git a/js/app/models/fcEventModel.js b/js/app/models/fcEventModel.js
diff --git a/js/app/models/hookModel.js b/js/app/models/hookModel.js
diff --git a/js/app/models/simpleEventModel.js b/js/app/models/simpleEventModel.js
diff --git a/js/app/models/splittedICalModel.js b/js/app/models/splittedICalModel.js
diff --git a/js/app/models/timezonemodel.js b/js/app/models/timezonemodel.js
diff --git a/js/app/models/veventModel.js b/js/app/models/veventModel.js
diff --git a/js/app/models/webcalModel.js b/js/app/models/webcalModel.js
diff --git a/js/app/service/autocompletionservice.js b/js/app/service/autocompletionservice.js
diff --git a/js/app/service/calendarService.js b/js/app/service/calendarService.js
diff --git a/js/app/service/davClient.js b/js/app/service/davClient.js
diff --git a/js/app/service/eventseditordialogservice.js b/js/app/service/eventseditordialogservice.js
diff --git a/js/app/service/hashService.js b/js/app/service/hashService.js
diff --git a/js/app/service/is.js b/js/app/service/is.js
diff --git a/js/app/service/mailerservice.js b/js/app/service/mailerservice.js
diff --git a/js/app/service/settingsservice.js b/js/app/service/settingsservice.js
diff --git a/js/app/service/timezoneService.js b/js/app/service/timezoneService.js
diff --git a/js/app/service/veventService.js b/js/app/service/veventService.js
diff --git a/js/app/service/webcalService.js b/js/app/service/webcalService.js
diff --git a/js/app/utility/colorUtility.js b/js/app/utility/colorUtility.js
diff --git a/js/app/utility/iCalSplitterUtility.js b/js/app/utility/iCalSplitterUtility.js
diff --git a/js/app/utility/popoverPositioningUtility.js b/js/app/utility/popoverPositioningUtility.js
diff --git a/js/app/utility/stringUtility.js b/js/app/utility/stringUtility.js
diff --git a/js/app/utility/webcalUtility.js b/js/app/utility/webcalUtility.js
diff --git a/js/app/utility/xmlUtility.js b/js/app/utility/xmlUtility.js
diff --git a/js/config/app.js b/js/config/app.js
diff --git a/js/config/config.js b/js/config/config.js
diff --git a/js/config/run.js b/js/config/run.js
diff --git a/js/gulpfile.js b/js/gulpfile.js
diff --git a/js/licenses/hsl_rgb_converter.js b/js/licenses/hsl_rgb_converter.js
diff --git a/js/licenses/jquery.timepicker.css b/js/licenses/jquery.timepicker.css
diff --git a/js/package.json b/js/package.json
diff --git a/js/timezones/README.md b/js/timezones/README.md
diff --git a/js/timezones/zones.json b/js/timezones/zones.json
diff --git a/js/yarn.lock b/js/yarn.lock
diff --git a/l10n/.gitkeep b/l10n/.gitkeep
diff --git a/l10n/af.js b/l10n/af.js
diff --git a/l10n/af.json b/l10n/af.json
diff --git a/l10n/ar.js b/l10n/ar.js
diff --git a/l10n/ar.json b/l10n/ar.json
diff --git a/l10n/ast.js b/l10n/ast.js
diff --git a/l10n/ast.json b/l10n/ast.json
diff --git a/l10n/bg.js b/l10n/bg.js
diff --git a/l10n/bg.json b/l10n/bg.json
diff --git a/l10n/ca.js b/l10n/ca.js
diff --git a/l10n/ca.json b/l10n/ca.json
diff --git a/l10n/cs.js b/l10n/cs.js
diff --git a/l10n/cs.json b/l10n/cs.json
diff --git a/l10n/da.js b/l10n/da.js
diff --git a/l10n/da.json b/l10n/da.json
diff --git a/l10n/de.js b/l10n/de.js
diff --git a/l10n/de.json b/l10n/de.json
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
diff --git a/l10n/el.js b/l10n/el.js
diff --git a/l10n/el.json b/l10n/el.json
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
diff --git a/l10n/eo.js b/l10n/eo.js
diff --git a/l10n/eo.json b/l10n/eo.json
diff --git a/l10n/es.js b/l10n/es.js
diff --git a/l10n/es.json b/l10n/es.json
diff --git a/l10n/es_419.js b/l10n/es_419.js
diff --git a/l10n/es_419.json b/l10n/es_419.json
diff --git a/l10n/es_AR.js b/l10n/es_AR.js
diff --git a/l10n/es_AR.json b/l10n/es_AR.json
diff --git a/l10n/es_CL.js b/l10n/es_CL.js
diff --git a/l10n/es_CL.json b/l10n/es_CL.json
diff --git a/l10n/es_CO.js b/l10n/es_CO.js
diff --git a/l10n/es_CO.json b/l10n/es_CO.json
diff --git a/l10n/es_CR.js b/l10n/es_CR.js
diff --git a/l10n/es_CR.json b/l10n/es_CR.json
diff --git a/l10n/es_DO.js b/l10n/es_DO.js
diff --git a/l10n/es_DO.json b/l10n/es_DO.json
diff --git a/l10n/es_EC.js b/l10n/es_EC.js
diff --git a/l10n/es_EC.json b/l10n/es_EC.json
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
diff --git a/l10n/es_HN.js b/l10n/es_HN.js
diff --git a/l10n/es_HN.json b/l10n/es_HN.json
diff --git a/l10n/es_MX.js b/l10n/es_MX.js
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
diff --git a/l10n/es_NI.js b/l10n/es_NI.js
diff --git a/l10n/es_NI.json b/l10n/es_NI.json
diff --git a/l10n/es_PA.js b/l10n/es_PA.js
diff --git a/l10n/es_PA.json b/l10n/es_PA.json
diff --git a/l10n/es_PE.js b/l10n/es_PE.js
diff --git a/l10n/es_PE.json b/l10n/es_PE.json
diff --git a/l10n/es_PR.js b/l10n/es_PR.js
diff --git a/l10n/es_PR.json b/l10n/es_PR.json
diff --git a/l10n/es_PY.js b/l10n/es_PY.js
diff --git a/l10n/es_PY.json b/l10n/es_PY.json
diff --git a/l10n/es_SV.js b/l10n/es_SV.js
diff --git a/l10n/es_SV.json b/l10n/es_SV.json
diff --git a/l10n/es_UY.js b/l10n/es_UY.js
diff --git a/l10n/es_UY.json b/l10n/es_UY.json
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
diff --git a/l10n/eu.js b/l10n/eu.js
diff --git a/l10n/eu.json b/l10n/eu.json
diff --git a/l10n/fa.js b/l10n/fa.js
diff --git a/l10n/fa.json b/l10n/fa.json
diff --git a/l10n/fi.js b/l10n/fi.js
diff --git a/l10n/fi.json b/l10n/fi.json
diff --git a/l10n/fr.js b/l10n/fr.js
diff --git a/l10n/fr.json b/l10n/fr.json
diff --git a/l10n/gl.js b/l10n/gl.js
diff --git a/l10n/gl.json b/l10n/gl.json
diff --git a/l10n/he.js b/l10n/he.js
diff --git a/l10n/he.json b/l10n/he.json
diff --git a/l10n/hr.js b/l10n/hr.js
diff --git a/l10n/hr.json b/l10n/hr.json
diff --git a/l10n/hu.js b/l10n/hu.js
diff --git a/l10n/hu.json b/l10n/hu.json
diff --git a/l10n/hy.js b/l10n/hy.js
diff --git a/l10n/hy.json b/l10n/hy.json
diff --git a/l10n/ia.js b/l10n/ia.js
diff --git a/l10n/ia.json b/l10n/ia.json
diff --git a/l10n/is.js b/l10n/is.js
diff --git a/l10n/is.json b/l10n/is.json
diff --git a/l10n/it.js b/l10n/it.js
diff --git a/l10n/it.json b/l10n/it.json
diff --git a/l10n/ja.js b/l10n/ja.js
diff --git a/l10n/ja.json b/l10n/ja.json
diff --git a/l10n/ka_GE.js b/l10n/ka_GE.js
diff --git a/l10n/ka_GE.json b/l10n/ka_GE.json
diff --git a/l10n/ko.js b/l10n/ko.js
diff --git a/l10n/ko.json b/l10n/ko.json
diff --git a/l10n/lb.js b/l10n/lb.js
diff --git a/l10n/lb.json b/l10n/lb.json
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
diff --git a/l10n/lv.js b/l10n/lv.js
diff --git a/l10n/lv.json b/l10n/lv.json
diff --git a/l10n/mk.js b/l10n/mk.js
diff --git a/l10n/mk.json b/l10n/mk.json
diff --git a/l10n/mn.js b/l10n/mn.js
diff --git a/l10n/mn.json b/l10n/mn.json
diff --git a/l10n/nb.js b/l10n/nb.js
diff --git a/l10n/nb.json b/l10n/nb.json
diff --git a/l10n/nl.js b/l10n/nl.js
diff --git a/l10n/nl.json b/l10n/nl.json
diff --git a/l10n/no-php b/l10n/no-php
diff --git a/l10n/oc.js b/l10n/oc.js
diff --git a/l10n/oc.json b/l10n/oc.json
diff --git a/l10n/pl.js b/l10n/pl.js
diff --git a/l10n/pl.json b/l10n/pl.json
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
diff --git a/l10n/ro.js b/l10n/ro.js
diff --git a/l10n/ro.json b/l10n/ro.json
diff --git a/l10n/ru.js b/l10n/ru.js
diff --git a/l10n/ru.json b/l10n/ru.json
diff --git a/l10n/sk.js b/l10n/sk.js
diff --git a/l10n/sk.json b/l10n/sk.json
diff --git a/l10n/sl.js b/l10n/sl.js
diff --git a/l10n/sl.json b/l10n/sl.json
diff --git a/l10n/sq.js b/l10n/sq.js
diff --git a/l10n/sq.json b/l10n/sq.json
diff --git a/l10n/sr.js b/l10n/sr.js
diff --git a/l10n/sr.json b/l10n/sr.json
diff --git a/l10n/sv.js b/l10n/sv.js
diff --git a/l10n/sv.json b/l10n/sv.json
diff --git a/l10n/th.js b/l10n/th.js
diff --git a/l10n/th.json b/l10n/th.json
diff --git a/l10n/tr.js b/l10n/tr.js
diff --git a/l10n/tr.json b/l10n/tr.json
diff --git a/l10n/uk.js b/l10n/uk.js
diff --git a/l10n/uk.json b/l10n/uk.json
diff --git a/l10n/vi.js b/l10n/vi.js
diff --git a/l10n/vi.json b/l10n/vi.json
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
diff --git a/screenshots/1.png b/screenshots/1.png
diff --git a/screenshots/2.png b/screenshots/2.png
diff --git a/screenshots/3.png b/screenshots/3.png
diff --git a/screenshots/4.png b/screenshots/4.png
diff --git a/screenshots/COPYING b/screenshots/COPYING
diff --git a/screenshots/README.md b/screenshots/README.md
diff --git a/screenshots/calendar_dropdown.png b/screenshots/calendar_dropdown.png
diff --git a/screenshots/calendar_editing.png b/screenshots/calendar_editing.png
diff --git a/screenshots/calendar_sharing.png b/screenshots/calendar_sharing.png
diff --git a/screenshots/calendarlist_datepicker.png b/screenshots/calendarlist_datepicker.png
diff --git a/screenshots/drag_create_event.png b/screenshots/drag_create_event.png
diff --git a/screenshots/editor_attendee.png b/screenshots/editor_attendee.png
diff --git a/screenshots/editor_details.png b/screenshots/editor_details.png
diff --git a/screenshots/editor_reminder.png b/screenshots/editor_reminder.png
diff --git a/screenshots/editor_repeating.png b/screenshots/editor_repeating.png
diff --git a/screenshots/import.png b/screenshots/import.png
diff --git a/screenshots/import_in_progress.png b/screenshots/import_in_progress.png
diff --git a/screenshots/popover.png b/screenshots/popover.png
diff --git a/screenshots/public_sharing.png b/screenshots/public_sharing.png
diff --git a/screenshots/public_sharing_embed.png b/screenshots/public_sharing_embed.png
diff --git a/screenshots/settings.png b/screenshots/settings.png
diff --git a/screenshots/sidebar.png b/screenshots/sidebar.png
diff --git a/screenshots/sidebar_attendees.png b/screenshots/sidebar_attendees.png
diff --git a/screenshots/sidebar_reminders.png b/screenshots/sidebar_reminders.png
diff --git a/screenshots/view_day.png b/screenshots/view_day.png
diff --git a/screenshots/view_month.png b/screenshots/view_month.png
diff --git a/screenshots/view_week.png b/screenshots/view_week.png
diff --git a/templates/colorpicker.html b/templates/colorpicker.html
diff --git a/templates/editor.popover.php b/templates/editor.popover.php
diff --git a/templates/editor.sidebar.php b/templates/editor.sidebar.php
diff --git a/templates/mail.publication.html.php b/templates/mail.publication.html.php
diff --git a/templates/mail.publication.text.php b/templates/mail.publication.text.php
diff --git a/templates/part.buttonarea.php b/templates/part.buttonarea.php
diff --git a/templates/part.calendarlist.item.php b/templates/part.calendarlist.item.php
diff --git a/templates/part.calendarlist.php b/templates/part.calendarlist.php
diff --git a/templates/part.createcalendar.php b/templates/part.createcalendar.php
diff --git a/templates/part.createsubscription.php b/templates/part.createsubscription.php
diff --git a/templates/part.datepicker.php b/templates/part.datepicker.php
diff --git a/templates/part.emptycontent.php b/templates/part.emptycontent.php
diff --git a/templates/part.event.dialog.php b/templates/part.event.dialog.php
diff --git a/templates/part.eventsalarms.php b/templates/part.eventsalarms.php
diff --git a/templates/part.eventsattendees.php b/templates/part.eventsattendees.php