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

lot stuff (recurrence, pkg version check, introtext, overridables) #641

Merged
merged 18 commits into from Apr 3, 2014

Conversation

Hoffi1
Copy link
Contributor

@Hoffi1 Hoffi1 commented Apr 3, 2014

(new text: COM_JEM_RECURRING_EVENT, COM_JEM_RECURRING_EVENT_DESC, COM_JEM_EDITEVENT_WARN_RECURRENCE)
Conflicts:
	site/common/views/tmpl/default_events_table.php
	site/views/editevent/view.html.php
…ect#627)

When an event is saved it is always removed from a recurrence set.
Also a complete recurrence set is dissolved if this is the first event.
 if first event is deleted (issue jemproject#627),
add version check to package (issue jemproject#632)
split into title and text to allow formatting inside tmpl file
also both "<br>" and "\n" are possible in language file
new event is published if reference event is archived or trashed
Hoffi1 added a commit that referenced this pull request Apr 3, 2014
lot stuff (recurrence, pkg version check, introtext, overridables)
@Hoffi1 Hoffi1 merged commit 9c544c5 into jemproject:master Apr 3, 2014
@diesl diesl added this to the JEM 1.9.6 beta milestone Apr 21, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants