nextcloud
/
calendar
mirror of https://github.com/nextcloud/calendar
0
0
Fork 0
Code Issues Releases Wiki Activity
5,313 Commits 72 Branches 169 Tags 135 MiB
Commit Graph

305 Commits

Author SHA1 Message Date
Georg Ehrke 17104d6010
Merge pull request #1816 from nextcloud/feature/1787/defaults_for_usersettings 
Allow to override defaults of calendar-app
 2020-01-15 12:47:32 +01:00
Georg Ehrke babcc11d13
Allow to override defaults of calendar-app 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-01-15 11:01:29 +01:00
Georg Ehrke ca50ef8a86
Merge pull request #1806 from nextcloud/bugfix/noid/window_resize 
Handle window resize on our own instead of relying on fullcalendar
 2020-01-15 10:27:57 +01:00
Justin Sleep 45640767b8 Add a reminder icon for events with notifications 
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
 2020-01-14 10:27:55 -06:00
Georg Ehrke 0c908e9238
Handle window resize on our own instead of relying on fullcalendar 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-01-14 14:20:25 +01:00
Georg Ehrke 9a2433c2ca
Bring back event-limit 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-01-13 12:15:05 +01:00
Georg Ehrke 7a8f32d124
Allow to create talk rooms from calendar 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-01-06 11:44:50 +01:00
Georg Ehrke 9ec87f87b7
Implement Fullcalendar's navLinkDayClick and navLinkWeekClick 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-12-05 17:35:13 +01:00
Georg Ehrke 6bcedc8122
Order all-day events by calendar first, title second 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-12-03 15:18:37 +01:00
Georg Ehrke 051df990d1
Test on PHP7.4, remove Firefox as dependency 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-12-02 15:10:00 +01:00
Georg Ehrke 41b33255a7
Merge pull request #1657 from nextcloud/tests/unit 
Unit tests
 2019-11-23 21:34:38 +01:00
Georg Ehrke 9dbb2c43e0
Enforce strict types in PHP 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-11-22 10:49:30 +01:00
Georg Ehrke 14e069827f
Add tests for alarmFormat 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-11-21 13:58:07 +01:00
Georg Ehrke a6c64c7989
Unit tests 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-11-21 13:58:06 +01:00
Georg Ehrke 0bc684a793
Give description field a default height of 2 rows 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-11-05 10:24:29 +01:00
Georg Ehrke 0760d4e2c2
Merge pull request #1617 from nextcloud/tests/models 
Add tests for rfcProps
 2019-10-30 11:47:52 +00:00
Georg Ehrke 04b86beb69
Add unit tests for default alarms and default categories 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-30 12:06:34 +01:00
Georg Ehrke 0ba05c5623
Add tests for rfcProps 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-30 11:51:08 +01:00
Georg Ehrke fe1fdaf097
Add timezone at creation of calendar 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-28 15:30:47 +01:00
Georg Ehrke f3ec278a68
Cleanup of calendar model, show calendar by default if owned by user 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-28 10:11:34 +01:00
Georg Ehrke 7e4de96077
Remove deprecated color utils, replace with uidToColor, add tests 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-27 12:13:23 +01:00
Georg Ehrke d2414561bd
fix phpunit tests 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-19 14:31:22 +02:00
Georg Ehrke 766b92731c
Reimplement public sharing and embedding 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-19 14:31:20 +02:00
Georg Ehrke d658f137cc
Finish Reminder implementation 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-19 14:31:18 +02:00
Georg Ehrke 1a6fabad00
add empty test skeletons for javascript 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-19 14:30:20 +02:00
Georg Ehrke 4af3e95da1
Update PHP Unit tests 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-19 14:30:15 +02:00
Georg Ehrke 683a2e34cc
remove legacy code 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-10-19 14:27:53 +02:00
Georg Ehrke 0cdb36e7b3
backport webcal access rules from DAV app implementation 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-04-03 15:31:29 +02:00
Vinicius Cubas Brand 8b0603803f Share calendar to a circle. 
Changes in the interface to allow:

* Calendar to be shared with a circle
* Show calendars (and events) that are shared with current user's circles

This need that the commit f45624f1819833086368d95f0173bd55a3fb8dae is applied in nextcloud core.

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2019-02-07 21:41:36 -02:00
Georg Ehrke 38e997962c
Merge pull request #950 from nextcloud/bugfix/noid/prevent_delivering_broken_ics_data_via_proxycontroller 
prevent delivering broken ics data via proxycontroller
 2018-11-23 20:15:10 +01:00
Georg Ehrke e72267c480
prevent delivering broken ics data via proxycontroller 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-11-23 20:06:09 +01:00
Georg Ehrke 3f6236ab0d
fix unit tests for ContactController 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-11-21 18:48:52 +01:00
Thomas Citharel 599c8ac6a1 Require local phpunit through composer and bump phpunit version 
* Uses PHPUnit 6.5 (requires PHP 7.0+, but we got rid with NC 14 (see nextcloud/server#7368)
* Namespaces are rewritten
* If composer isn't installed, it installs it (taken from nextcloud/news)

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Remove PHPUnit Download in CI

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Properly handle phpunit on travis for 5.6

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Remove trouble composer.lock

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Don't install composer deps twice on CI

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-08-06 16:22:28 +02:00
Thomas Citharel ed519db3d5 Remove bower and replace every dependency with npm ones 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-08-06 15:06:53 +02:00
Georg Ehrke 385ee9fd40
fix tests 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-07-17 11:50:07 +02:00
Georg Ehrke 8efa5eaf54
fix handling of events with recurrence exceptions only (#754) 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-03-06 13:22:35 +01:00
Georg Ehrke 29d75bdc83
add better error handling for importing calendars (#745) 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-03-05 15:48:11 +01:00
Georg Ehrke 28dc8bf407
timezone select (#743) 
* add config option for timezone to SettingsController

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

* add timezone config to SettingsService

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

* add timezone input in settings area

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

* connect timezone setting to actual calendar grid

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-03-05 15:47:35 +01:00
Georg Ehrke 3ac45b2f04
fix parsing all-day events with DTSTART only (#735) 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-03-05 15:47:18 +01:00
Georg Ehrke f7d5494b07
fix ProxyControllerTest, issues caused by updated Guzzle lib in the server 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-02-23 18:12:05 +01:00
Georg Ehrke f6bf926b6f
fix displayname on public sharing site 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-01-31 14:57:20 +01:00
Georg Ehrke 17e69514ec
Merge pull request #613 from nextcloud/app-css-guidelines 
Move to SCSS [was: App to css guidelines]
 2018-01-11 20:11:39 +01:00
Georg Ehrke a616176880
fix unit tests 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-01-10 20:24:08 +01:00
Georg Ehrke 958cf80e52
Merge pull request #661 from nextcloud/bugfix/269/fix_double_escaping 
fix escaping of alarm type names
 2017-12-05 13:48:33 +01:00
Georg Ehrke 3e58c7d3af
fix escaping of alarm type names 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-12-05 12:22:00 +01:00
Georg Ehrke b4a1460ad4
add special treatment for duplicate errors when importing calendars 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-12-05 11:00:21 +01:00
Leon Klingele 5f361390e4
autocompletion: Use 'POST' instead of 'GET' method to access API 
This prevents including the search term in webserver logs.
It will also break all clients using this API endpoint, which is
fine, as non-OCS APIs are meant to be private and shouldn't be used
by 3rdparty apps.
 2017-10-16 10:29:08 +02:00
Georg Ehrke f5d0d84a9f Merge pull request #526 from nextcloud/disable-public-link-share 
Disable publishing when Sharing by link is disabled
 2017-07-19 11:49:52 +02:00
Georg Ehrke 7c23a09df8 Merge pull request #475 from nextcloud/bugfix/459/show_displayname_when_adding_new_share 
show displayname instead of userid after creating a new user share
 2017-07-19 08:26:41 +02:00
Georg Ehrke bb43cc583a
shareapi_allow_links defaults to yes 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-07-17 17:39:43 +02:00
Georg Ehrke c987c52359
fix bug and tests for disallowing public sharing via Share API config 2017-07-17 17:32:39 +02:00
Thomas Citharel bfd9bacb84
Disable publishing when Sharing by link is disabled 
Signed-off-by: Thomas Citharel <tcit@tcit-pc>
 2017-07-17 17:17:39 +02:00
Thomas Bille 2164127273 Add colors datepicker, focus day when navigating 
Signed-off-by: Thomas Bille <contact@tbille.fr>
 2017-07-17 12:01:42 +02:00
Georg Ehrke e0a1b5bca3 Merge pull request #477 from nextcloud/feature/239/include_calendarname_in_public_calendar 
make public sharing links readable
 2017-06-14 12:25:58 +02:00
Georg Ehrke 5aefb45ad4
better variable names and unit tests 2017-05-30 20:30:23 +02:00
Georg Ehrke f775f5ce53
make public sharing links readable 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-26 22:24:49 +02:00
Georg Ehrke 678190eacc
show displayname instead of userid after creating a new user share 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-26 15:59:49 +02:00
Georg Ehrke 86e5b16156 Merge pull request #453 from nextcloud/remove_legacy_shit 
remove Nextcloud 9 and 10 legacy code
 2017-05-25 21:23:06 +02:00
Georg Ehrke cb7a7f7d65
fix spelling of email 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-23 10:37:23 +02:00
Georg Ehrke 0f42f84d77
remove Nextcloud 9 and 10 legacy code 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-23 10:20:01 +02:00
Georg Ehrke 74e9462821 Merge pull request #397 from nextcloud/feature/noid/replace_server_side_timezone_foo 
replace server side timezone querying logic
 2017-05-22 08:39:56 +02:00
Georg Ehrke aa88f64c74 Merge pull request #450 from nextcloud/bugfix/noid/owner_displayname 
use owner-displayname if available
 2017-05-21 11:16:38 +02:00
Georg Ehrke 95b47e3cc1
use owner-displayname if available 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-15 10:54:44 +02:00
Georg Ehrke 4cc40f3912
sanitize missing VALUE=DATE 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-14 18:47:42 +02:00
Georg Ehrke d0eaf68546
allow editing props of shared calendars and disallow editing shares for sharee 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-10 19:21:56 +02:00
Georg Ehrke e5620198bf Merge pull request #372 from nextcloud/feature/243/public_sharing_improvements 
Public sharing improvements
 2017-05-03 19:02:53 +02:00
Georg Ehrke 4dd47aae6c Merge pull request #413 from nextcloud/bugfix/142/fix_handling_of_recurrence_id 
fix handling of recurrence ID
 2017-04-09 16:42:07 +02:00
Georg Ehrke ba044b1cf4
comment out THISANDFUTURE test for now 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-09 16:29:30 +02:00
Georg Ehrke 01c72e61c1
fix handling of recurrence ID 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-07 22:26:23 +02:00
Georg Ehrke 4dd2ad6a74
update jstz detect and fullcalendar 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-04 18:31:01 +02:00
Georg Ehrke 35574fe14d
move timezone querying logic to browser 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-01 20:36:39 +02:00
Georg Ehrke ef1221bb10
remove server-side timezone querying logic 2017-04-01 12:04:08 +02:00
Georg Ehrke ee05a6cca0
parse owner's displayname from xml 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-29 13:45:27 +02:00
Georg Ehrke 56c5121ae2
rename public/ to embed/ but keep public/ for legacy reasons 2017-03-29 13:45:27 +02:00
Georg Ehrke 9d6624a31a
replace publishurl and publicurl with publicToken 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-29 13:45:27 +02:00
Georg Ehrke 1ca1400e86
add isEmbedded data attr 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-29 13:45:26 +02:00
Georg Ehrke 99a837783e
add sharing token as a html data attr 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-29 13:45:26 +02:00
Georg Ehrke 849d63ee7c
generate download and webcal url on the server 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-29 13:45:26 +02:00
Georg Ehrke 0da8bc757d
add public sharing route with branding and minimize duplicate code in viewController 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-29 13:45:23 +02:00
Georg Ehrke e24fb1b8ad
fix source maps 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-27 22:40:51 +02:00
Georg Ehrke 7d9180d2c3 Merge pull request #371 from nextcloud/bugfix/11/check_dtend_is_after_dtstart 
make sure user can not set dtend to something earlier than dtstart
 2017-03-23 14:16:56 +01:00
Georg Ehrke bd3cc25784
check if dtend is before dtstart before saving event 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-19 13:09:31 +01:00
Georg Ehrke e50ce2449c
remove dtstart/dtend .type because its redundant 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-19 12:47:26 +01:00
Georg Ehrke 78afa39fd0
store timezone promise for the time its not resolved yet 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-16 15:50:17 +01:00
Georg Ehrke 4ad7b34807
adapt calendar and vevent services to new XMLUtility 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-02-18 20:48:56 +01:00
Georg Ehrke 61c389b9df
refactor XMLUtility 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-02-18 20:48:55 +01:00
Georg Ehrke 1b712ff12b
include vendor.ie.js when accessed via ie 2017-02-18 20:48:55 +01:00
Georg Ehrke 780a21a8cb
ugly hack to fix unit test 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-02-18 19:16:28 +01:00
Georg Ehrke 91122856a8 Merge pull request #327 from nextcloud/cleanup/js_minifying 
Bundle and minify vendor files
 2017-02-12 14:05:00 +01:00
Georg Ehrke a054564c8b
prevent some undefined index errors 2017-02-09 12:03:01 +01:00
Georg Ehrke cff96a3427
bundle and minify dependencies 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-02-02 16:38:31 +01:00
Georg Ehrke 3b62601320
split up viewcontroller 2017-01-20 11:34:12 +01:00
Georg Ehrke 8510cd53b3
update dependencies 2017-01-19 13:06:10 +01:00
Georg Ehrke 874acb826f
fix unsharing/editing shares when sharing API is disabled 2017-01-17 12:11:43 +01:00
Georg Ehrke fb4df861b4
ship autosize 2017-01-16 22:43:07 +01:00
Georg Ehrke 00ddf1891e Merge pull request #256 from nextcloud/feature/41/add_webcal_protocol_handler 
add web protocol handler for webcal
 2017-01-13 22:28:36 +01:00
Georg Ehrke 524ae817b3
replace TRIGGER:P with TRIGGER:P0D 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-01-13 19:21:25 +01:00
Georg Ehrke 44ab9a1155
lazy load timezones when rendering events 2016-12-24 15:23:22 +01:00
Thomas Citharel fcfbd4bba8 Merge pull request #181 from nextcloud/bugfix/42/save_webcal_301 
save 301 responses from webcal subscriptions
 2016-12-22 14:43:01 +01:00
Georg Ehrke ab1c3fb067
hash -> url 2016-12-21 22:44:01 +01:00