[Examples] MSL example bundle inconsistently named #1255
Assignees
Milestone
Comments
larkin
pushed a commit
that referenced
this issue
Nov 25, 2016
Closes #1287. Squashed commit of the following: commit af9ba3095859684cb2465f1d5222a14db231fdb7 Merge: c98286d 31308b1 Author: Pete Richards <[email protected]> Date: Fri Nov 25 14:57:32 2016 -0800 Merge branch 'open1193' into open1287-integration Resolve conflicts in glyph files as documented in pull request: #1287 (comment) Closes #1287 commit 31308b1 Author: Andrew Henry <[email protected]> Date: Tue Nov 22 17:08:10 2016 +0000 [Time Conductor] Addressed code review comments. Fixes #1287 commit db6386e Author: Henry <[email protected]> Date: Wed Nov 9 11:52:39 2016 -0800 Removed redundant ConductorService commit a9ec8db Merge: fc36674 dfa4591 Author: Henry <[email protected]> Date: Wed Nov 9 08:23:07 2016 -0800 Merge branch 'master' into open1193 commit fc36674 Author: Henry <[email protected]> Date: Wed Nov 9 08:23:01 2016 -0800 Updated wording of docs commit d0906ba Author: Henry <[email protected]> Date: Fri Nov 4 10:48:05 2016 -0700 Fixed TOI not showing commit 099c56c Author: Henry <[email protected]> Date: Fri Oct 28 16:46:06 2016 -0700 Fixed failing tests commit 7cc008e Author: Henry <[email protected]> Date: Fri Oct 28 10:28:41 2016 -0700 Added tests for tables, TOI controller commit b0901e8 Author: Henry <[email protected]> Date: Thu Oct 27 10:42:31 2016 -0700 Added tests for ConductorAxisController and TimeConductor commit dfed0a0 Author: Henry <[email protected]> Date: Wed Oct 26 18:07:50 2016 -0700 Added ConductorAxisController tests commit c3322e3 Author: Henry <[email protected]> Date: Tue Oct 25 20:54:24 2016 -0700 Added tests for MctTableController commit 8e76ebb Author: Henry <[email protected]> Date: Tue Oct 25 15:48:15 2016 -0700 Removed debugging code commit 93735bc Author: Henry <[email protected]> Date: Mon Oct 24 15:13:45 2016 -0700 Removed bundle definition of MctAxisController Documenting code commit a942541 Author: Henry <[email protected]> Date: Sun Oct 23 19:54:01 2016 -0700 [Time Conductor] Fixed memory leak due to listeners not being deregistered commit 49e600d Author: Henry <[email protected]> Date: Sat Oct 22 16:47:11 2016 -0700 [Time Conductor] Fixed zoom slider behavior commit f580661 Author: Henry <[email protected]> Date: Sat Oct 22 14:46:14 2016 -0700 [Time Conductor] support TOI from real-time tables commit 029d2b3 Author: Henry <[email protected]> Date: Thu Oct 20 14:32:34 2016 -0700 [Examples] Simplified MSL example, fixed object tree not loading by default, renamed. Fixes #1256. Fixes #1255 commit 482eb4a Author: Henry <[email protected]> Date: Sat Oct 22 13:09:05 2016 -0700 [Time Conductor] Using new API commit 843c678 Merge: b56ab0a 08ca765 Author: Henry <[email protected]> Date: Fri Oct 21 10:21:22 2016 -0700 In process of merging commit b56ab0a Author: Henry <[email protected]> Date: Wed Oct 19 16:30:26 2016 -0700 [Time Conductor] Implement default sort, fix unpredictable positioning using % left, set TOI on conductor init. #1193 commit d12ae77 Author: Henry <[email protected]> Date: Wed Oct 19 11:29:42 2016 -0700 Further TOI improvements commit 2256447 Merge: 9f3ec3b 86b51f6 Author: Henry <[email protected]> Date: Tue Oct 18 16:32:12 2016 -0700 Merge branch 'open1193' of https://github.com/nasa/openmctweb into open1193 commit 9f3ec3b Author: Henry <[email protected]> Date: Tue Oct 18 16:31:59 2016 -0700 Fixed issue with scrolling to row after bounds change commit 86b51f6 Author: Charles Hacskaylo <[email protected]> Date: Mon Oct 17 17:19:50 2016 -0700 [Frontend] Small refactor for mct-include Fixes #933 Fixes #1193 Markup and CSS tweaked to support using mct-include as the main container for the TOI element; TC, plots and tables all updated. commit dadca62 Author: Henry <[email protected]> Date: Mon Oct 17 15:54:34 2016 -0700 Positioning of TOI in tables and plots commit 7a09bc1 Author: Henry <[email protected]> Date: Mon Oct 17 10:11:59 2016 -0700 Migrated TOI functionality to common controller commit 6bea6b3 Merge: 660757f 8f67cbd Author: Henry <[email protected]> Date: Fri Oct 14 14:38:57 2016 -0700 Merge branch 'open1193' of https://github.com/nasa/openmctweb into open1193 commit 660757f Author: Henry <[email protected]> Date: Fri Oct 14 14:38:46 2016 -0700 Added TimeOfInterestController commit 8f67cbd Author: Charles Hacskaylo <[email protected]> Date: Fri Oct 14 11:33:35 2016 -0700 [Frontend] Fixed cursor: grab on Time Conductor Fixes #933 Fixes #1193 Moved cursor: grab into mixin; sass cleanups commit 07a4e26 Author: Charles Hacskaylo <[email protected]> Date: Fri Oct 14 11:03:23 2016 -0700 [Frontend] TOI finalizing Fixes #933 Fixes #1193 HTML template cleaned up; checked in snow theme, theme colors tweaked; padding finalized; now uses val-to-left instead of -to-right; commit 271c788 Author: Charles Hacskaylo <[email protected]> Date: Fri Oct 14 10:22:26 2016 -0700 [Frontend] TOI in tables Fixes #933 Fixes #1193 WIP commit b7e8a1b Author: Charles Hacskaylo <[email protected]> Date: Thu Oct 13 15:55:48 2016 -0700 [Frontend] Styling for TOI element Fixes #933 Fixes #1193 WIP: Table TOI element in progress commit 6042e4a Author: Charles Hacskaylo <[email protected]> Date: Thu Oct 13 13:46:27 2016 -0700 [Frontend] Styling for TOI element Fixes #933 Fixes #1193 WIP: plots and TC done, moving on to tables; moved sass into conductor-v2; moved constants; commit 1a53430 Author: Charles Hacskaylo <[email protected]> Date: Thu Oct 13 11:42:10 2016 -0700 [Frontend] Refactor TOI element Fixes #933 Fixes #1193 WIP; TOI as mct-include; layout uses flex-box; preparing to move TOI sass into conductor-v2 directory; commit 42acf92 Author: Charles Hacskaylo <[email protected]> Date: Wed Oct 12 18:34:51 2016 -0700 [Frontend] Adding resync and dedicated unpin buttons Fixes #933 Fixes #1193 VERY WIP! commit 3f0eb0b Author: Charles Hacskaylo <[email protected]> Date: Wed Oct 12 18:33:53 2016 -0700 [Frontend] New glyphs for use by TOI Fixes #933 Fixes #1193 Symbols font updated commit 086307b Author: Henry <[email protected]> Date: Tue Oct 11 17:16:51 2016 -0700 Fixed scrolling behavior with TOI commit 938bf3c Merge: 3910437 8b2047c Author: Henry <[email protected]> Date: Tue Oct 11 13:26:20 2016 -0700 Merge branch 'open1182' into open1193 commit 8b2047c Author: Henry <[email protected]> Date: Tue Oct 11 13:25:24 2016 -0700 Fixed issue with setting deltas commit 3910437 Merge: 70c4ce2 02c543f Author: Henry <[email protected]> Date: Tue Oct 11 12:48:37 2016 -0700 Merged changes to zoom commit 02c543f Author: Henry <[email protected]> Date: Tue Oct 11 12:45:18 2016 -0700 Fixed zoom in real-time mode commit 70c4ce2 Author: Henry <[email protected]> Date: Fri Oct 7 17:57:14 2016 -0700 Added support for clicking row to set TOI commit b995a8b Merge: 51a9557 b384e84 Author: Henry <[email protected]> Date: Fri Oct 7 16:11:59 2016 -0700 Merged from open1182 commit b384e84 Merge: 5babf72 07140b1 Author: Henry <[email protected]> Date: Fri Oct 7 15:02:41 2016 -0700 Merge branch 'open933' into open1182 commit 07140b1 Merge: 3e9c0eb cbd001e Author: Henry <[email protected]> Date: Fri Oct 7 14:54:18 2016 -0700 Merge branch 'master' into open933 commit 51a9557 Author: Henry <[email protected]> Date: Fri Oct 7 14:51:59 2016 -0700 [Time Conductor] Refactored time of interest as optional generic behavior of MctTable commit dfbbc3b Merge: 430645b 47a0aba Author: Henry <[email protected]> Date: Thu Oct 6 10:23:42 2016 -0700 alt-click to select TOI from table commit 3e9c0eb Merge: f1d2072 8a00181 Author: Henry <[email protected]> Date: Wed Oct 5 12:25:04 2016 -0700 Merged from master to resolve build issues commit f1d2072 Author: Henry <[email protected]> Date: Wed Oct 5 11:17:22 2016 -0700 Added license information commit 430645b Author: Henry <[email protected]> Date: Wed Oct 5 09:04:13 2016 -0700 TOI working in time conductor commit 47a0aba Author: Charles Hacskaylo <[email protected]> Date: Tue Oct 4 18:12:01 2016 -0700 [Frontend] TOI sass and markup sanding Fixes #933 Fixes #1193 Color tweaks; Cleanups, commented code removal, etc.; tightened up tabular padding and font sizes; commit 0ed0a48 Author: Charles Hacskaylo <[email protected]> Date: Tue Oct 4 15:49:18 2016 -0700 [Frontend] Styling for TOI element Fixes #933 Fixes #1193 Tabular styling for TOI; commit 1650aae Author: Charles Hacskaylo <[email protected]> Date: Mon Oct 3 15:56:56 2016 -0700 [Frontend] Styling for TOI element Fixes #933 Fixes #1193 WIP: Tabular styling for TOI; TODO: make bottom border work commit d3bf6c5 Author: Charles Hacskaylo <[email protected]> Date: Mon Oct 3 15:15:56 2016 -0700 [Frontend] Styling for TOI element Fixes #933 Fixes #1193 WIP: Markup and CSS for plots and TC near complete; TODO: revised styling in tabular views; commit 5cd0c8a Author: Henry <[email protected]> Date: Fri Sep 30 12:41:14 2016 -0700 [Time Conductor] merged from open1182 commit 5babf72 Author: Henry <[email protected]> Date: Thu Sep 29 11:21:11 2016 -0700 [Time Conductor] Tweaked the break points for zoom level indicator commit 22da348 Author: Charles Hacskaylo <[email protected]> Date: Thu Sep 29 10:41:21 2016 -0700 [Frontend] Styling for TOI element Fixes #933 Fixes #1193 WIP: Markup and CSS revisions for updated UX approach; TODO: cosmetic CSS commit 99253a5 Author: Charles Hacskaylo <[email protected]> Date: Tue Sep 27 20:42:33 2016 -0700 [Frontend] Styling for TOI element Fixes #933 Fixes #1193 WIP: Markup and CSS revisions for updated UX approach commit 2db4aa6 Author: Henry <[email protected]> Date: Fri Sep 23 13:06:22 2016 -0700 [Time Conductor] Added zoom level label commit bb2ae2f Author: Charles Hacskaylo <[email protected]> Date: Fri Sep 23 11:07:06 2016 -0700 [Frontend] Styling for TOI element Fixes #933 Fixes #1193 Finalized TOI in plots, table and TC commit 0cf4c92 Author: Charles Hacskaylo <[email protected]> Date: Thu Sep 22 19:15:10 2016 -0700 [Frontend] Styling for TOI element in tables Fixes #933 Fixes #1193 WIP: styling in tabular mostly done, needs more unit testing TODO: fix hide/show for pinned TOI in plots - don't show pinned TOI on hover when not .active commit 3c95c09 Author: Henry <[email protected]> Date: Thu Sep 22 17:22:25 2016 -0700 [Time Conductor] Refactored out use of angular event bus in favor of making TimeConductorViewService an event emitter. commit adbcc40 Author: Charles Hacskaylo <[email protected]> Date: Thu Sep 22 16:06:45 2016 -0700 [Frontend] Styling for TOI element Fixes #933 Fixes #1193 WIP: TOI in tables commit 1c3bd69 Author: Charles Hacskaylo <[email protected]> Date: Thu Sep 22 16:06:16 2016 -0700 [Frontend] Styling for TOI element, some refactoring Fixes #933 Fixes #1193 Moves some TOI styling into dedicated new scss file; Enhancements to TOI in plots to bring into parity with TOI in TC approach; commit 49ee5cb Author: Henry <[email protected]> Date: Thu Sep 22 15:18:48 2016 -0700 [Time Conductor] Destroy listeners in ConductorAxisController commit 1a93ba2 Author: Charles Hacskaylo <[email protected]> Date: Thu Sep 22 15:09:42 2016 -0700 [Frontend] Styling for TOI element in TC Fixes #933 Fixes #1193 Final for now; both types of TOI added to TC markup; Hover behavior; constant values in the right places; commit 98122cc Author: Henry <[email protected]> Date: Tue Sep 20 11:40:58 2016 -0700 [Time Conductor] Added Zoom commit 7fcafb6 Author: Henry <[email protected]> Date: Mon Sep 12 16:53:48 2016 -0700 [Time Conductor] Added pan to Time Conductor commit d77922d Author: Pete Richards <[email protected]> Date: Thu Sep 15 09:37:11 2016 -0700 Revert "[proxyUrl] pass URL parameters to proxied URL" commit 2e81550 Author: Victor Woeltjen <[email protected]> Date: Wed Sep 14 10:16:33 2016 -0700 Revert "[Build] Check dependencies for vulnerabilities" commit 8eb7585 Author: Victor Woeltjen <[email protected]> Date: Mon Aug 29 10:58:02 2016 -0700 [README] Warn about root installation issues Mitigates #1151. commit 904d56a Author: Henry <[email protected]> Date: Thu Sep 22 13:32:43 2016 -0700 [Time Conductor] #933 Clean up time conductor listeners on scope destruction commit c0a96b3 Author: Charles Hacskaylo <[email protected]> Date: Thu Sep 22 10:33:05 2016 -0700 [Frontend] Styling for TOI element in TC Fixes #933 Fixes #1193 WIP, tweaking TOI in TC commit 27e6caf Author: Charles Hacskaylo <[email protected]> Date: Fri Sep 16 18:51:51 2016 -0700 [Frontend] Styling for TOI element in plots Fixes #933 Fixes #1193 Relates to #1182 WIP, adding TOI to plot view; Integrated Andrew's work from #1182; Significant changes to markup and additions to plot scss; commit 2c7ae95 Merge: 2c81b72 41a160f Author: Charles Hacskaylo <[email protected]> Date: Fri Sep 16 15:11:25 2016 -0700 Merge branch 'open1182' into open1193 commit 41a160f Merge: 92a80c3 156ba83 Author: Henry <[email protected]> Date: Fri Sep 16 14:25:49 2016 -0700 Merge branch 'master' into open1182 commit 92a80c3 Author: Henry <[email protected]> Date: Mon Sep 12 16:53:48 2016 -0700 [Time Conductor] Added pan to Time Conductor commit 2c81b72 Author: Charles Hacskaylo <[email protected]> Date: Thu Sep 15 16:02:30 2016 -0700 [Frontend] Styling for TOI element in plots Fixes #933 Fixes #1193 WIP, adding TOI to plot view. commit 9e2debf Author: Charles Hacskaylo <[email protected]> Date: Thu Sep 15 15:43:29 2016 -0700 [Frontend] Styling for TC's TOI element Fixes #933 Fixes #1193 I lied in my last commit - one more alignment tweak needed. Now I'm done. commit 35872e2 Author: Charles Hacskaylo <[email protected]> Date: Thu Sep 15 15:40:03 2016 -0700 [Frontend] Styling for TC's TOI element Fixes #933 Fixes #1193 TOI in TC done for now. commit 98e67f8 Author: Charles Hacskaylo <[email protected]> Date: Thu Sep 15 14:55:06 2016 -0700 [Frontend] Styling for TC's TOI element Fixes #933 Fixes #1193 WIP: adjust spacing; added pagination buttons commit f912b9e Author: Charles Hacskaylo <[email protected]> Date: Wed Sep 14 18:40:55 2016 -0700 [Frontend] Styling for TC's TOI element Fixes #933 WIP, TC v2 changes commit 2df1e2b Author: Charles Hacskaylo <[email protected]> Date: Wed Sep 14 18:40:29 2016 -0700 [Frontend] Styling for TC's TOI element Fixes #933 WIP, global changes commit 9e85341 Author: Charles Hacskaylo <[email protected]> Date: Wed Sep 14 15:16:16 2016 -0700 [Frontend] Fixed color for TC clock hands Fixes #933 commit 11e0603 Merge: a1331b7 f732387 Author: Henry <[email protected]> Date: Tue Sep 13 13:25:37 2016 -0700 Merge branch 'master' into open933 commit a1331b7 Merge: d1960b2 e73bb4f Author: Henry <[email protected]> Date: Mon Sep 12 15:07:05 2016 -0700 Merge branch 'master' into open933 commit d1960b2 Author: Henry <[email protected]> Date: Mon Sep 12 14:54:16 2016 -0700 [Time Conductor] Resolved merge conflicts commit 9a06325 Merge: e639e05 4c6ca58 Author: Henry <[email protected]> Date: Mon Sep 12 14:39:24 2016 -0700 Merge branch 'master' into open933 commit e639e05 Author: Henry <[email protected]> Date: Fri Sep 9 16:39:21 2016 -0700 [Time Conductor] Fixing bugs found in smoke testing. Fixes #933 commit fbab890 Author: Henry <[email protected]> Date: Wed Sep 7 14:29:21 2016 -0700 [Time Conductor] Switched conductor to mct-include rather than mct-representation to avoid warnings commit d37dd52 Merge: 7af5875 58391de Author: Henry <[email protected]> Date: Tue Sep 6 16:43:17 2016 -0700 Merge branch 'master' into open933 commit 7af5875 Author: Henry <[email protected]> Date: Tue Sep 6 10:04:29 2016 -0700 [Time Conductor] #933 Fixed code style errors commit c6eaa3d Author: Andrew Henry <[email protected]> Date: Wed Aug 24 15:28:19 2016 +0100 [Time Conductor] Adding tests and fixing failing ones. #933 commit 4cf6126 Author: Henry <[email protected]> Date: Wed Aug 10 18:22:30 2016 -0700 Refactoring based on feedback Refactoring controller Migrating functions off controller onto service class Simplified modes Adding comments Removed unnecessary validation Fixing testing issues commit 4ae6da0 Author: Charles Hacskaylo <[email protected]> Date: Tue Aug 9 17:47:31 2016 -0700 [Frontend] Data viz in Time Conductor smaller Fixes #933 Reduced height of data viz bar in Time Conductor v2; commit ae39343 Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 8 12:14:20 2016 -0700 [Frontend] Fix for bad fix Fixes #1112 Put overflow: hidden back at outer wrapper level (now on .t-object.primary-pane ) which doens't clip the Inspector expand/collapse; did better unit testing; commit 62ee7e5 Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 8 11:21:01 2016 -0700 [Frontend] Fix for collapse Inspector button Fixes #1112 Moved min-width and overflow: hidden to TC-specific elements; removed overflow: hidden from .primary-pane commit 7557a86 Merge: 46e644e c8931f8 Author: Henry <[email protected]> Date: Fri Aug 5 16:37:36 2016 -0700 Merge branch 'master' into open933 commit 46e644e Author: Pete Richards <[email protected]> Date: Fri Aug 5 14:44:18 2016 -0700 Use key to retrieve default commit af7954c Author: Pete Richards <[email protected]> Date: Fri Aug 5 11:24:51 2016 -0700 Trigger digests when bounds are set commit 0e0ad64 Author: Henry <[email protected]> Date: Thu Aug 4 10:41:58 2016 -0700 Fixed issue with wrong deltas being applied commit f3fd386 Author: Henry <[email protected]> Date: Wed Aug 3 21:03:09 2016 -0700 Retain time system on mode change commit 25b9f37 Author: Henry <[email protected]> Date: Wed Aug 3 20:16:03 2016 -0700 Fixed loss of time system options on navigation commit 6b482d4 Merge: f96f78f 9a72c96 Author: Henry <[email protected]> Date: Wed Aug 3 19:57:03 2016 -0700 Merged mode-specific defaults, with some refactoring commit f96f78f Author: Henry <[email protected]> Date: Wed Aug 3 19:34:31 2016 -0700 Select appropriate tick source based on mode commit 579233a Author: Henry <[email protected]> Date: Wed Aug 3 18:30:01 2016 -0700 Fixed delta format issue on navigation commit 9a72c96 Author: Pete Richards <[email protected]> Date: Wed Aug 3 18:06:39 2016 -0700 [TCv2] different defaults by mode commit f4e1879 Author: Henry <[email protected]> Date: Wed Aug 3 17:43:07 2016 -0700 stop listening to tick source on time system change commit f844495 Author: Henry <[email protected]> Date: Wed Aug 3 17:40:37 2016 -0700 Support deltaFormat on timeSystems commit 9007522 Author: Pete Richards <[email protected]> Date: Wed Aug 3 13:05:43 2016 -0700 [TCv2] get conductor without service commit 6501e2e Author: Henry <[email protected]> Date: Wed Aug 3 12:22:13 2016 -0700 Added isUTCBased to TimeSystem interface commit b9c4110 Author: Henry <[email protected]> Date: Tue Aug 2 22:18:44 2016 -0700 Time Conductor state retained on navigation commit 34c62ba Author: Henry <[email protected]> Date: Tue Aug 2 15:16:35 2016 -0700 Time Conductor in edit mode commit 1eea5ce Merge: 4cd579d 1173828 Author: Henry <[email protected]> Date: Mon Aug 1 20:29:50 2016 -0700 merged from master commit 4cd579d Author: Henry <[email protected]> Date: Mon Aug 1 20:16:46 2016 -0700 Pass numerical value to format functions commit 1173828 Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 1 18:56:33 2016 -0700 [Frontend] Styling for unsynced elements Fixes #933 commit ca5206d Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 1 18:55:49 2016 -0700 [Frontend] Fixing issues with theme coloring Fixes #933 commit 573f1f9 Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 1 18:04:17 2016 -0700 [Frontend] Hide zoom slider control Fixes #933 Temporarily hiding per request from Andrew today; commit c5c45f0 Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 1 18:01:28 2016 -0700 [Frontend] Update TC2 markup and sass Fixes #933 Update markup and sass in TC2 to be in line with updates from master from #1047 glyphs to cssclass approach; commit 121ab41 Author: Henry <[email protected]> Date: Mon Aug 1 17:51:15 2016 -0700 Apply formatting, filter modes by tick source availability commit 753bd97 Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 1 17:12:44 2016 -0700 Merge remote-tracking branch 'origin/master' into open933-c # Conflicts: # platform/commonUI/edit/res/templates/create/create-menu.html # platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot # platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg # platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf # platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff # platform/commonUI/general/res/sass/_archetypes.scss # platform/commonUI/general/res/sass/_constants.scss # platform/commonUI/general/res/sass/_icons.scss # platform/commonUI/general/res/sass/_main.scss # platform/commonUI/general/res/sass/_mixins.scss # platform/commonUI/general/res/sass/controls/_buttons.scss # platform/commonUI/general/res/templates/controls/time-controller.html # platform/commonUI/themes/snow/res/sass/_constants.scss commit fcd7ab9 Merge: a75ea67 9b58aa0 Author: Henry <[email protected]> Date: Mon Aug 1 17:12:00 2016 -0700 Merge branch 'open933' of https://github.com/nasa/openmctweb into open933 commit c699cb8 Merge: 579c6b6 d1e1ba1 Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 1 17:11:37 2016 -0700 Merge remote-tracking branch 'origin/master' into open933-c # Conflicts: # platform/commonUI/edit/res/templates/create/create-menu.html # platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot # platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg # platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf # platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff # platform/commonUI/general/res/sass/_archetypes.scss # platform/commonUI/general/res/sass/_constants.scss # platform/commonUI/general/res/sass/_icons.scss # platform/commonUI/general/res/sass/_main.scss # platform/commonUI/general/res/sass/_mixins.scss # platform/commonUI/general/res/sass/controls/_buttons.scss # platform/commonUI/general/res/templates/controls/time-controller.html # platform/commonUI/themes/snow/res/sass/_constants.scss commit a75ea67 Author: Henry <[email protected]> Date: Mon Aug 1 17:11:01 2016 -0700 Format updates when time system selected commit 9b58aa0 Author: Pete Richards <[email protected]> Date: Mon Aug 1 17:03:00 2016 -0700 [TCv2] Add conductorService for compatibility Add conductor service for compatibility with old plugins that depend on the conductor service. commit 579c6b6 Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 1 16:30:51 2016 -0700 [Frontend] Styling TC unsynced elements Fixes #933 WIP: Styling for unsynced elements commit 762f43f Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 1 16:26:47 2016 -0700 [Frontend] Styling TC unsynced elements Fixes #933 WIP: Styling for unsynced elements commit ce5d0ef Author: Henry <[email protected]> Date: Mon Aug 1 16:03:27 2016 -0700 Merged stylesheet changes commit 142ee2f Merge: 482fcbf 523d674 Author: Henry <[email protected]> Date: Mon Aug 1 15:44:49 2016 -0700 Added LocalTimeSystem and merged latest styles commit 482fcbf Author: Henry <[email protected]> Date: Mon Aug 1 15:14:23 2016 -0700 Refactored bundle commit 523d674 Author: Charles Hacskaylo <[email protected]> Date: Mon Aug 1 12:00:53 2016 -0700 [Frontend] Added support for thematic styling of Time Conductor v2 Fixes #933 Added theme sass files commit 7af2212 Author: Henry <[email protected]> Date: Wed Jul 27 12:05:03 2016 -0400 Prevent tabbing into end bounds when not in fixed mode commit 8e59072 Author: Henry <[email protected]> Date: Wed Jul 27 11:55:12 2016 -0400 Removed LAD and Realtime modes commit c1bbc4f Author: Henry <[email protected]> Date: Wed Jul 27 10:38:04 2016 -0400 Code cleanup commit aa4a5e5 Author: Henry <[email protected]> Date: Tue Jul 26 16:55:00 2016 -0400 Improved support from plot commit 5b2eb72 Author: Henry <[email protected]> Date: Tue Jul 26 08:33:30 2016 -0400 [Time Conductor] Addressed documentation issues commit 1b7fc57 Author: Henry <[email protected]> Date: Mon Jul 25 16:55:27 2016 -0400 Added status support to plots commit a4f6f6f Author: Henry <[email protected]> Date: Mon Jul 25 12:09:15 2016 -0400 Added license commit 19fd63b Merge: c2c8e16 a10ded2 Author: Henry <[email protected]> Date: Thu Jul 21 20:06:50 2016 -0700 Merge branch 'open933-frontend-b' into open933 commit c2c8e16 Author: Henry <[email protected]> Date: Thu Jul 21 20:03:40 2016 -0700 Added scale sensitive formatting to UTCTimeFormat commit a10ded2 Merge: da7c636 e6d8944 Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 20 18:33:58 2016 -0700 Merge remote-tracking branch 'origin/open933' into open933-frontend-b # Conflicts: # platform/features/conductor-v2/res/sass/time-conductor.scss # platform/features/conductor/res/sass/time-conductor.scss commit da7c636 Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 20 18:22:20 2016 -0700 [Frontend] Time Conductor v2 styling Fixes #933 Redo TC icon to use font symbol, added new symbol for brackets to font files; font anti-aliasing mod for .ui-symbol class; layout tweaks; mobile tweaks. commit b392633 Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 20 15:48:22 2016 -0700 [Frontend] Time Conductor v2 styling Fixes #933 WIP: Significant mobile and desktop style tweaks; moved constants into their own include file; commit ff16784 Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 20 11:43:40 2016 -0700 [Frontend] Time Conductor v2 styling Fixes #933 Changed desktop and mobile RT UI to display end datetime and hide start; WIP: mobile styling for main UI of TC; commit 2124fe0 Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 20 10:18:42 2016 -0700 [Frontend] Renew support for Time Conductor v1 Fixes #933 Minor fixes to TCv1 for mobile commit e6d8944 Author: Henry <[email protected]> Date: Tue Jul 19 20:17:06 2016 -0700 Modified main.js commit ea1defa Author: Charles Hacskaylo <[email protected]> Date: Tue Jul 19 18:33:24 2016 -0700 [Frontend] Renew support for Time Conductor v1 Fixes #933 Time Conductors v1 and v2 now build and load their own isolated CSS files. All previous styling for TCv1 should be re-enabled. Note that Conductor v2 mobile is not complete yet. commit 2a19394 Author: Henry <[email protected]> Date: Tue Jul 19 19:54:52 2016 -0700 Added compatibility layer to support existing plots and historical tables commit f641edb Author: Charles Hacskaylo <[email protected]> Date: Tue Jul 19 18:33:24 2016 -0700 [Frontend] Renew support for Time Conductor v1 Fixes #933 Time Conductors v1 and v2 now build and load their own isolated CSS files. All previous styling for TCv1 should be re-enabled. Note that Conductor v2 mobile is not complete yet. commit 15a608a Author: Henry <[email protected]> Date: Mon Jul 18 18:44:29 2016 -0700 Populate format in input fields commit 334ca64 Merge: 0af49ef 4087b9c Author: Henry <[email protected]> Date: Mon Jul 18 14:25:02 2016 -0700 Merged open933-frontend commit 0af49ef Author: Henry <[email protected]> Date: Mon Jul 18 08:23:27 2016 -0700 Refactored out modes, time systems, etc. commit 4087b9c Author: Charles Hacskaylo <[email protected]> Date: Fri Jul 15 14:39:29 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 WIP: Fixed look for Firefox commit 43a804e Author: Charles Hacskaylo <[email protected]> Date: Fri Jul 15 07:54:32 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 WIP: Added zoom current range indicator; tweaks to style commit b3a4f52 Author: Charles Hacskaylo <[email protected]> Date: Thu Jul 14 18:30:49 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 WIP: Adding zoom control with HTML5 input range type; Refactored sass slightly to move display: inline-block out of mixin containerBase and into .s-btn. commit 671e301 Author: Charles Hacskaylo <[email protected]> Date: Thu Jul 14 16:40:05 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 New _animations scss include, moved scss around. commit 3798283 Author: Charles Hacskaylo <[email protected]> Date: Thu Jul 14 16:39:27 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 New _animations scss include, moved scss around. commit 8c5538e Author: Charles Hacskaylo <[email protected]> Date: Thu Jul 14 14:58:18 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 "Sticky" clock anim for LAD mode commit 2f9fbfe Author: Henry <[email protected]> Date: Wed Jul 13 20:33:47 2016 -0700 More refactoring commit 2baca65 Author: Henry <[email protected]> Date: Wed Jul 13 19:50:58 2016 -0700 Refactoring commit 8b694ef Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 13 19:42:51 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 In-progress: color/size tweaks, fixes for espresso theme commit e193e3d Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 13 19:16:27 2016 -0700 Merge open933 latest, resolve conflicts Fixes #933 Fair amount of manual fixing in time-conductor.html commit 8214c8e Merge: 33b2225 14463d3 Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 13 19:16:00 2016 -0700 Merge open933 latest, resolve conflicts Fixes #933 Fair amount of manual fixing in time-conductor.html commit 33b2225 Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 13 18:48:17 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 In-progress: restructured markup to move modeModel farther out; animated icon commit 14463d3 Author: Henry <[email protected]> Date: Wed Jul 13 18:17:27 2016 -0700 Added end delta commit fcfda50 Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 13 15:00:16 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 In-progress: color tweaks, bar sizing, field widths commit 06af84c Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 13 13:14:32 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 In-progress: fixed SVG text color, field styling for fixed vs. real-time, markup cleanup commit 5238aa2 Author: Charles Hacskaylo <[email protected]> Date: Wed Jul 13 08:07:59 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 In-progress; fixed SVG text color commit fd29473 Author: Henry <[email protected]> Date: Tue Jul 12 15:02:39 2016 -0700 Support resize commit 97f3fd5 Author: Henry <[email protected]> Date: Tue Jul 12 10:14:26 2016 -0700 Changed default duration to fifteen minutes commit 0884169 Author: Henry <[email protected]> Date: Tue Jul 12 10:08:08 2016 -0700 Added duration commit 2056d87 Merge: 585da38 64ce8a2 Author: Henry <[email protected]> Date: Mon Jul 11 14:27:30 2016 -0700 Merge branch 'open933-frontend' into open933 commit 64ce8a2 Author: Charles Hacskaylo <[email protected]> Date: Mon Jul 11 14:03:41 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 Color adjusts, mini super-menu size and font tweaks, glyphs added to selector, SVG style fixes in progress commit 585da38 Author: Henry <[email protected]> Date: Mon Jul 11 13:46:46 2016 -0700 Fixed some merge issues commit bf0e85a Author: Charles Hacskaylo <[email protected]> Date: Mon Jul 11 11:35:26 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #933 Renamed main class; removed unused <style> defs commit 84b7a9d Merge: 7b7b21d 11caa83 Author: Charles Hacskaylo <[email protected]> Date: Mon Jul 11 11:29:35 2016 -0700 Merge remote-tracking branch 'origin/open933' into open933-frontend Fixes #933 Conflicts: platform/features/conductor-v2/src/TimeConductorController.js commit 11caa83 Author: Henry <[email protected]> Date: Mon Jul 11 11:18:23 2016 -0700 Updated modes commit 0017b77 Merge: 5cc81ba 788483e Author: Henry <[email protected]> Date: Mon Jul 11 11:06:22 2016 -0700 Merged markup changes commit 7b7b21d Author: Charles Hacskaylo <[email protected]> Date: Mon Jul 11 11:05:47 2016 -0700 [Frontend] Styling of Time Conductor v2 Fixes #933 Tweaks to language; tweak to class name in markup commit 788483e Author: Charles Hacskaylo <[email protected]> Date: Mon Jul 11 10:37:08 2016 -0700 [Frontend] Styling of Time Conductor v2 Fixes #933 Tweaks to language commit 7b19f91 Merge: 0a0bc55 4e7b69c Author: Charles Hacskaylo <[email protected]> Date: Mon Jul 11 10:31:14 2016 -0700 [Frontend] Merge latest from open933 Fixes #933 Resolve conflicts in mode-menu.html, mode-selector.html, time-conductor.html; apply tweaks, language, etc. commit 5cc81ba Author: Henry <[email protected]> Date: Mon Jul 11 10:26:34 2016 -0700 [Time Conductor] Added mode class to time conductor commit 0a0bc55 Author: Charles Hacskaylo <[email protected]> Date: Fri Jul 8 17:11:43 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #993 In-progress; mode menu names and descriptors modified, markup cleaned up commit 4e7b69c Author: Henry <[email protected]> Date: Fri Jul 8 16:57:50 2016 -0700 Enabled fixed and real-time modes commit cf83040 Author: Charles Hacskaylo <[email protected]> Date: Fri Jul 8 16:54:49 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #993 In-progress; Create menu refactoring and new mini Create menu commit 32f7bc8 Author: Charles Hacskaylo <[email protected]> Date: Fri Jul 8 16:54:13 2016 -0700 [Frontend] Styling for Time Conductor v2 Fixes #993 In-progress; class renaming continued, cleanups in markup file, in-page styles ported to scss commit e230b92 Author: Henry <[email protected]> Date: Fri Jul 8 15:15:12 2016 -0700 Fixed bug with date selector having to be clicked twice commit 58ed500 Author: Henry <[email protected]> Date: Thu Jul 7 16:57:03 2016 -0700 Time sync via conductor commit bca5eb0 Author: Henry <[email protected]> Date: Thu Jul 7 09:47:46 2016 -0700 [Time Conductor] #933 Initial markup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
The MSL bundle is registered as
example/msl-adapter. In the interests of keeping it consistent with its path, this should be renamed toexample/mslThe text was updated successfully, but these errors were encountered: