Feature/meeting page #22
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
krausweb
commented
Aug 14, 2019
krausweb
commented
- added the main layout and styles
- added the meeting route for the meeting page
- fixed link from calendar list to the meeting page
- added real meeting date
- added new icons
- fixed icon styles
- added layout and styles on the mobile version
- added the main layout and styles - added the meeting route for the meeting page - fixed link from calendar list to meeting page
- added real meeting date
- added new icons - fixed icon styles
- fixed styles on the mobile version
# Conflicts: # resources/fonts/RIS-font-icons.eot # resources/fonts/RIS-font-icons.svg # resources/fonts/RIS-font-icons.ttf # resources/fonts/RIS-font-icons.woff # resources/fonts/RIS-font-icons.woff2 # resources/fonts/source/RIS-font-icons.sfd # resources/fonts/source/svg/doc.svg # resources/sass/base/_icons.scss # resources/sass/components/_index.scss # resources/sass/pages/_index.scss # resources/views/styleguide.blade.php
- fixed marge conflict
- updated layout and styles on the mobile version
- fixed styles, minor changes
- fixed the after selectors on the calendar list page
- update the week position on the calendar list page
nanosch
requested changes
Aug 15, 2019
- fixed js lint notices
|
@MBeckers please, See temporary method getMeeting |
- added the search block for the participant tab on the desktop version
# Conflicts: # resources/js/components/Ux/Dropdown.vue # resources/js/components/Ux/Sorting.vue # resources/sass/components/_index.scss # resources/sass/pages/_calendar.scss
- fix merge conflict
- fixed breadcrumbs error
…ationssystem into feature/meeting-page
- added styles and layout to agenda tab in the meeting detail page - added the real data to the blade from the backend - fixed the resolution_text field in AgendaCollection - added new icons
- refactored the collapse/uncollapse parent-children agenda list, in progress
MBeckers
requested changes
Sep 2, 2019
resources/js/components/Meeting.vue
Outdated
| this.backButtonPublic = false; | ||
| this.backButtonPrivate = false; | ||
| this.isActiveParent = this.isActiveParent === false; | ||
| //this.isActiveChild = this.isActiveChild === false; |
resources/js/components/Meeting.vue
Outdated
| // show only list block where chosen items | ||
| // agendaHeadParent.classList.toggle('ris-agenda-list_hidden'); | ||
| // agendaHeadParent.classList.toggle('ris-agenda-list_active'); | ||
|
|
There was a problem hiding this comment.
remove please if not needed
resources/js/components/Meeting.vue
Outdated
| && agendaChildNumber === +agendaMainNumber) { | ||
|
|
||
| console.log('Add child: ', agenda.id, agendaChildNumber, agendaMainNumber); | ||
| this.agendaChildRef[agenda.id] = true; |
There was a problem hiding this comment.
do we need the console.log?
- fixed collapse data on the agenda tab on the mobile version, in progress
- fixed collapse data on the agenda tab, in progress
- fixed conflict search functionality with collapse, on the agenda tab
# Conflicts: # resources/fonts/RIS-font-icons.eot # resources/fonts/RIS-font-icons.svg # resources/fonts/RIS-font-icons.ttf # resources/fonts/RIS-font-icons.woff # resources/fonts/RIS-font-icons.woff2 # resources/fonts/source/RIS-font-icons.sfd # resources/sass/base/_icons.scss # resources/sass/components/_tab-list.scss # resources/sass/pages/_index.scss # resources/views/layouts/breadcrumbs.blade.php # resources/views/styleguide.blade.php
- fixed icons marge conflict
- fixed people tab - refactored the general member vue component
|
All tabs compleated and fixed. |
- fixed the footer on the Calendar list page
- added the API get method for the new, finished, update themes
|
we still have console logs, when opening tabs
we should get rid of this |
- fixed js lint notice
|
Hm, strange, please generate a new app.js (yarn dev) |
- changed an active tab to first tab
MBeckers
approved these changes
Sep 4, 2019
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.