Commits
![David Walend](https://secure.gravatar.com/avatar/783aa4f692de93caaf9da69372d82e11.jpg?s=96&d=mm)
David Walend authored dffe5aa1119M
Merge pull request #1297 in SHRINE/shrine from feature/SHRINE2020-1180 to develop * commit 'c36d67b1a23e9957aef2ad507b958ee0b2df6ce1': Testing of SHRINE2020-1180 and SHRINE2020-1091 - caveat some new bug tickets Two more hacks to get SHRINE2020-1180 into review Changed to Seqs of events and links for SHRINE2020-1180 Planning SHRINE2020-1180 SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086- Modified to return a list of timelineEvents and timelineLinks in the json from the front-end SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existing "when" panel with an additional ACTIVE Event 3 - Code cleanup SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existing "when" panel with an additional ACTIVE Event 3 - Fix dragging concepts within an event panel SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existing "when" panel with an additional ACTIVE Event 3 - Fix dragging concepts within an event panel SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existing "when" panel with an additional ACTIVE Event 3 - Typo fix SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existing "when" panel with an additional ACTIVE Event 3 - Changes to generalize timeline event creation SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existing "when" panel with an additional ACTIVE Event 3 - Revert port used for local dev server SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existing "when" panel with an additional ACTIVE Event 3 - Removed commented out code SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existing "when" panel with an additional ACTIVE Event 3 - Fixed front-end unit tests SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existing "when" panel with an additional ACTIVE Event 3 - reverted local development port back to 6443 SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existing "when" panel with an additional ACTIVE Event 3
Showing diff toaa0af85e5a8