Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recurring meetings #15620

Merged
merged 133 commits into from
Dec 4, 2024
Merged
Changes from 1 commit
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
d2b9e6f
Prepare basic recurring meeting setup
oliverguenther Apr 26, 2024
4886368
Add proof of concept to create schedules
mrmir May 28, 2024
fa27978
Add feature flag
oliverguenther Oct 1, 2024
fd1323d
Rework menu
oliverguenther Oct 1, 2024
1339c0b
Pass request to meetings menu
oliverguenther Oct 1, 2024
91276b2
Add filter menu for recurring meetings
oliverguenther Oct 2, 2024
006002e
Start primerized create form
oliverguenther Oct 2, 2024
c11e5d4
Add recurring meetings to dropdown and dialog
oliverguenther Nov 10, 2024
d02b49b
Add schedule
oliverguenther Nov 10, 2024
b3985d1
Add frequency/iterations form
oliverguenther Nov 11, 2024
367b5a3
Add services
oliverguenther Nov 11, 2024
115f110
Recurring meetings menu entry
oliverguenther Nov 11, 2024
2229ae4
Fix setting project
oliverguenther Nov 11, 2024
101a52c
Template
oliverguenther Nov 12, 2024
23e0aef
add bi-weekly
oliverguenther Nov 12, 2024
ef132e2
Merge branch 'dev' into feature/recurring-meetings
oliverguenther Nov 13, 2024
c69210e
Add template sideinfo
oliverguenther Nov 13, 2024
6e822aa
Skip mails when adding participants
oliverguenther Nov 13, 2024
f158787
exclude templated meetings
oliverguenther Nov 13, 2024
70461c0
Add header for templates
oliverguenther Nov 13, 2024
228586c
Prevent deletion of meeting template
oliverguenther Nov 13, 2024
03f1193
Fix breadcrumb
oliverguenther Nov 13, 2024
25cca0e
WIP Add show table and initialization
mrmir Nov 13, 2024
6cc9cc1
Change icon for calendar
oliverguenther Nov 13, 2024
085b5d2
remove unused template
oliverguenther Nov 13, 2024
01f2b80
add template has_one
oliverguenther Nov 13, 2024
9e79f44
meeting form
oliverguenther Nov 14, 2024
c8031d4
Fix creation of recurring
oliverguenther Nov 15, 2024
8e81a34
working edit
oliverguenther Nov 15, 2024
3f4af24
specify end time
oliverguenther Nov 15, 2024
294424e
Add header actions
mrmir Nov 19, 2024
fc7dd18
Add initial recurring meeting frequency label
mrmir Nov 20, 2024
a33ed25
Add index page
mrmir Nov 20, 2024
004d8c0
Add soft delete and restore for occurrences
mrmir Nov 20, 2024
01274c4
Refine implementation of scheduled meetings using skeletons
oliverguenther Nov 21, 2024
4937ee1
Add template link
oliverguenther Nov 21, 2024
0039894
Paginate
oliverguenther Nov 21, 2024
16cfc23
Move init of meeting to recurring
oliverguenther Nov 21, 2024
9e549f7
Add schedule in words
mrmir Nov 22, 2024
a7ee620
Add show series action item
oliverguenther Nov 22, 2024
577b306
Implement changed show page of occurrence
oliverguenther Nov 22, 2024
ba7c051
Add interval, fewer frequencies
oliverguenther Nov 22, 2024
6e84e37
Add interval to schedule
oliverguenther Nov 22, 2024
fd060ff
Try to add non working days
oliverguenther Nov 22, 2024
fe84501
Update meetings index to display recurring occurrences correctly
mrmir Nov 22, 2024
c15a148
Update schedule in words
mrmir Nov 22, 2024
cb3c5b6
Fix exception rule
oliverguenther Nov 23, 2024
ba927df
Fix occurrence for working days
oliverguenther Nov 23, 2024
1e3083d
Hide interval when selecting working_days
oliverguenther Nov 23, 2024
4b22d3a
Document show-when-value-selected
oliverguenther Nov 23, 2024
b709bfe
Set interval to 1 when changing to working_days
oliverguenther Nov 23, 2024
cfb91a9
Fix dialog
oliverguenther Nov 25, 2024
5740702
Merge branch 'dev' into feature/recurring-meetings
oliverguenther Nov 25, 2024
b47d2ab
Adapt to mobile table
oliverguenther Nov 25, 2024
d730211
Update type filter
mrmir Nov 25, 2024
7195fb3
Rename TypeFilter -> RecurringFilter
oliverguenther Nov 26, 2024
91f28b2
Start date group
oliverguenther Nov 26, 2024
454c846
Combined Filter component
oliverguenther Nov 26, 2024
9c7a4eb
Updated menu
oliverguenther Nov 26, 2024
50b873e
Merge branch 'dev' into feature/recurring-meetings
oliverguenther Nov 26, 2024
8145ff0
Update label created by me
oliverguenther Nov 26, 2024
ea01f5f
Add validation on end_date > start_date
oliverguenther Nov 27, 2024
68a360c
Implement sorting through query
oliverguenther Nov 27, 2024
67063d0
Render all meeting series in the sidebar
oliverguenther Nov 27, 2024
ac73ea3
Select my meetings only when href passed
oliverguenther Nov 27, 2024
932ff90
WIP Add initial specs
mrmir Nov 27, 2024
e3f20c7
Fix date validation
oliverguenther Nov 28, 2024
d5aa2b9
Use the correct date formatter in the subtitle
mrmir Nov 28, 2024
5a72451
Add spec for date validation
oliverguenther Nov 28, 2024
e3029d5
Change label to View template
oliverguenther Nov 28, 2024
b659bc2
Add edit series button
oliverguenther Nov 28, 2024
12e098d
Fix deletion of recurring meetings
oliverguenther Nov 28, 2024
4249e15
Correctly hide form for end_after options
oliverguenther Nov 28, 2024
709e024
Update copy behaviour to never allow recurring copies
mrmir Nov 28, 2024
b3de8d0
Fix location value in form
mrmir Nov 28, 2024
28b134a
Fix meeting details form
oliverguenther Nov 28, 2024
a23b034
Add scheduled meetings table
oliverguenther Nov 28, 2024
61422d7
Replace destroy/restore with actual destroy
oliverguenther Nov 29, 2024
015c413
Uniqueness
oliverguenther Nov 29, 2024
fd39c4d
Delete with schedule
oliverguenther Nov 29, 2024
5b17417
Switch to start_time
oliverguenther Nov 29, 2024
17f8a8b
Use start_time in schedule
oliverguenther Nov 29, 2024
91a8672
Add helper for time formatting to the current user
oliverguenther Nov 29, 2024
8ff6d78
fixup! Delete with schedule
oliverguenther Nov 29, 2024
31e0e46
Move update_start_time to concern
oliverguenther Nov 29, 2024
41f82e2
Delete cancelled meetings when changing schedule
oliverguenther Nov 29, 2024
01e062f
Allow passing dates directly
oliverguenther Nov 29, 2024
baf964d
Remove cancelled occurrences when changing schedules
oliverguenther Nov 29, 2024
c62cf70
Limit count_rule until end_date
mrmir Nov 29, 2024
a657f79
Show changed start times for occurrences
mrmir Nov 29, 2024
40741d1
Indent case
oliverguenther Dec 2, 2024
fbd5ff7
Fix destroy path to include project
oliverguenther Dec 2, 2024
2dc1c14
Fix past meetings
oliverguenther Dec 2, 2024
b1a8bed
Schedule first occurrence on creation
oliverguenther Dec 2, 2024
2ea44f9
Merge branch 'dev' into feature/recurring-meetings
oliverguenther Dec 2, 2024
47e1093
Linting
oliverguenther Dec 2, 2024
101c42e
fixup! Linting
oliverguenther Dec 2, 2024
83ff834
Autoschedule job
oliverguenther Dec 2, 2024
2068087
Add more schedule tests
oliverguenther Dec 2, 2024
c9275c7
Fix project-based destroy
oliverguenther Dec 2, 2024
a8f2a69
Redirect to template, not show
oliverguenther Dec 2, 2024
b26d144
Don't cache user time zone in request store
oliverguenther Dec 2, 2024
9067c5e
Fix forgotten invited where
oliverguenther Dec 2, 2024
af113dd
fixup! Linting
oliverguenther Dec 2, 2024
252566b
Remove default meeting order
oliverguenther Dec 2, 2024
6815382
Fix meetings index spec with new ordering
oliverguenther Dec 2, 2024
89feef5
Fix path
oliverguenther Dec 2, 2024
00cf518
Convert meeting tab to cuprite
oliverguenther Dec 2, 2024
928a7ab
Fix expectation for meeting tab
oliverguenther Dec 2, 2024
39a46f0
More robust selector on meeting tab
oliverguenther Dec 2, 2024
4ea6130
Change global menu spec
oliverguenther Dec 2, 2024
e18b675
Add more CRUD specs
mrmir Dec 3, 2024
41e8917
Fix dates and times
mrmir Dec 3, 2024
515f923
Allow cancellation of scheduled meetings
mrmir Dec 3, 2024
8f698c0
Lint
oliverguenther Dec 4, 2024
a0f9d2e
Reschedule init job when updating schedule
oliverguenther Dec 4, 2024
7a6eba0
Fix end date in the form
mrmir Dec 4, 2024
dc59d31
Test cancellation
oliverguenther Dec 4, 2024
52470d8
Extract create spec
oliverguenther Dec 4, 2024
6d200d4
Fix specs
oliverguenther Dec 4, 2024
9140018
Add spec when lacking permissions
oliverguenther Dec 4, 2024
d739bca
Fix cancellation of scheduled meetings
mrmir Dec 4, 2024
807c94e
Render meetings with correct project link
oliverguenther Dec 4, 2024
a3706f0
Remove unused disable
oliverguenther Dec 4, 2024
485ef52
Remove useless cop disable
oliverguenther Dec 4, 2024
88965c5
Add contract specs
oliverguenther Dec 4, 2024
27a517d
Add delete contract spec
oliverguenther Dec 4, 2024
072a3ce
Revert "Add delete contract spec"
oliverguenther Dec 4, 2024
8e014c5
Add delete contract spec for meetings itself
oliverguenther Dec 4, 2024
9eb9e04
Fix spec
oliverguenther Dec 4, 2024
eb0dab0
Hide past cancelled occurrences
mrmir Dec 27, 2024
a053a35
Show different delete labels and messages
mrmir Dec 27, 2024
42129b5
Move to request spec
oliverguenther Dec 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add feature flag
  • Loading branch information
oliverguenther committed Nov 11, 2024
commit fa2797806dec8821492af3301a212c9a9d10aa47
3 changes: 3 additions & 0 deletions config/initializers/feature_decisions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,6 @@

OpenProject::FeatureDecisions.add :custom_field_of_type_hierarchy,
description: "Allows the use of the custom field type 'Hierarchy'."

OpenProject::FeatureDecisions.add :recurring_meetings,
description: "Differentiate between one-time and recurring meetings."