Henry
|
088416905d
|
Added duration
|
2016-07-12 10:08:08 -07:00 |
|
Henry
|
2056d87453
|
Merge branch 'open933-frontend' into open933
|
2016-07-11 14:27:30 -07:00 |
|
Henry
|
585da38a16
|
Fixed some merge issues
|
2016-07-11 13:46:46 -07:00 |
|
Charles Hacskaylo
|
bf0e85a94c
|
[Frontend] Styling for Time Conductor v2
Fixes #933
Renamed main class; removed unused <style>
defs
|
2016-07-11 11:35:26 -07:00 |
|
Charles Hacskaylo
|
84b7a9dc2f
|
Merge remote-tracking branch 'origin/open933' into open933-frontend
Fixes #933
Conflicts:
platform/features/conductor-v2/src/TimeConductorController.js
|
2016-07-11 11:29:35 -07:00 |
|
Henry
|
11caa8396a
|
Updated modes
|
2016-07-11 11:18:23 -07:00 |
|
Henry
|
0017b77439
|
Merged markup changes
|
2016-07-11 11:06:22 -07:00 |
|
Charles Hacskaylo
|
7b7b21d748
|
[Frontend] Styling of Time Conductor v2
Fixes #933
Tweaks to language; tweak to class name in markup
|
2016-07-11 11:05:47 -07:00 |
|
Charles Hacskaylo
|
788483ec13
|
[Frontend] Styling of Time Conductor v2
Fixes #933
Tweaks to language
|
2016-07-11 10:37:08 -07:00 |
|
Charles Hacskaylo
|
7b19f91ce6
|
[Frontend] Merge latest from open933
Fixes #933
Resolve conflicts in
mode-menu.html, mode-selector.html,
time-conductor.html; apply tweaks, language, etc.
|
2016-07-11 10:31:14 -07:00 |
|
Henry
|
5cc81ba12a
|
[Time Conductor] Added mode class to time conductor
|
2016-07-11 10:26:34 -07:00 |
|
Charles Hacskaylo
|
0a0bc55f5f
|
[Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; mode menu names and
descriptors modified, markup cleaned up
|
2016-07-08 17:11:43 -07:00 |
|
Henry
|
4e7b69c4df
|
Enabled fixed and real-time modes
|
2016-07-08 16:57:50 -07:00 |
|
Charles Hacskaylo
|
cf83040c4b
|
[Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; Create menu refactoring and new
mini Create menu
|
2016-07-08 16:54:49 -07:00 |
|
Charles Hacskaylo
|
32f7bc86af
|
[Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; class renaming continued,
cleanups in markup file, in-page styles
ported to scss
|
2016-07-08 16:54:13 -07:00 |
|
Henry
|
e230b92946
|
Fixed bug with date selector having to be clicked twice
|
2016-07-08 15:15:12 -07:00 |
|
Henry
|
58ed500ecf
|
Time sync via conductor
|
2016-07-07 16:57:03 -07:00 |
|
Henry
|
bca5eb0fdb
|
[Time Conductor] #933 Initial markup
|
2016-07-07 09:47:46 -07:00 |
|