Victor Woeltjen
bce5643994
Merge branch 'master' into jscs-rebase-142
...
Conflicts:
platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
platform/representation/src/MCTRepresentation.js
2016-05-20 13:07:58 -07:00
Victor Woeltjen
ad5691142e
[Code Style] Rename shadowing variables
2016-05-20 13:05:32 -07:00
Victor Woeltjen
e3208187bf
Merge branch 'master' into persist-on-mutation-825
...
Conflicts:
platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
2016-05-20 10:59:54 -07:00
Victor Woeltjen
1419ff86e8
Merge pull request #946 from nasa/open636
...
[New Edit Mode] #636 Removed edit concerns from DropGesture
2016-05-20 10:52:11 -07:00
Henry
601bc03ba2
[New Edit Mode] #636 Modified EditAndCompose action to rely on a slightly refactored EditActionPolicy to remove folder specific logic
2016-05-20 10:42:17 -07:00
Henry
776586ae25
[New Edit Mode] #634 Removed edit concerns from MctRepresentation
2016-05-19 17:09:56 -07:00
Victor Woeltjen
2a4004fd5b
[Timeline] Test mct-representation ordering
...
Verify that a configuration object has been added to scope before
changing templates. #908
2016-05-19 15:09:57 -07:00
Victor Woeltjen
b5229d7786
[Timeline] Commit changes on toggle
...
#908
2016-05-19 15:06:06 -07:00
Victor Woeltjen
20ecf168f2
[Timeline] Change ordering in mct-representation
...
...such that the configuration property is available in scope
when a view is first instantiated. #908
2016-05-19 15:00:12 -07:00
Victor Woeltjen
bcf85db9c4
[Persistence] Delegate new 'persisted' method
2016-05-19 13:31:27 -07:00
Victor Woeltjen
f1e81c359e
[Persistence] Satisfy JSHint
2016-05-19 12:17:20 -07:00
Victor Woeltjen
8279acc9a5
[Persistence] Don't expect persist calls in PropertiesAction spec
2016-05-19 12:04:08 -07:00
Victor Woeltjen
63438ad9ba
[Persistence] Don't expect persist calls in LinkAction spec
2016-05-19 12:02:42 -07:00
Victor Woeltjen
467f4d2257
[Persistence] Don't expect persist calls in RemoveAction spec
2016-05-19 12:00:51 -07:00
Victor Woeltjen
a5aaa6f103
[Persistence] Don't expect persist calls in LocationCapability spec
2016-05-19 11:55:05 -07:00
Victor Woeltjen
9b273bc148
[Persistence] Don't expect persist calls in EditRepresenter spec
2016-05-19 11:52:58 -07:00
Victor Woeltjen
0aba9122a1
[Persistence] Don't expect persist calls in LinkService spec
2016-05-19 11:51:50 -07:00
Victor Woeltjen
ac3706dfb6
[Persistence] Don't expect persist calls in specs
2016-05-19 11:50:12 -07:00
Victor Woeltjen
3905171457
[Persistence] Don't expect persist calls in spec
2016-05-19 11:48:16 -07:00
Victor Woeltjen
1e03f22086
[Persistence] Don't expect persist calls in spec
2016-05-19 11:46:50 -07:00
Victor Woeltjen
360fdeaec8
[Persistence] Don't expect persist calls in spec
2016-05-19 11:44:26 -07:00
Victor Woeltjen
d5914dfde9
[Persistence] Remove caching of persistence capability
...
...as this no longer needs to be invoked directly.
2016-05-19 11:42:58 -07:00
Victor Woeltjen
d3f2a24267
Merge branch 'master' into persist-on-mutation-825
...
Conflicts:
platform/core/src/capabilities/PersistenceCapability.js
platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
2016-05-19 11:41:08 -07:00
Victor Woeltjen
f9631ff4c5
[Code Style] Fix style missed by gulp fixstyle
...
...and remove an unnecessary comment, too.
2016-05-19 11:29:41 -07:00
Victor Woeltjen
fa77139077
[Code Style] Run gulp fixstyle
...
...to apply code style settings from #142 .
2016-05-19 11:29:13 -07:00
Victor Woeltjen
de43aa81be
Merge pull request #838 from nasa/open824_rebase
...
[Edit] #824 - Remove EditableDomainObject
2016-05-18 17:01:24 -07:00
Charles Hacskaylo
a729edd399
[Frontend] Label context arrows now always visible
...
open #929
- Also enable frame dragging in title area when
editing in Layout;
- CSS and markup changes;
2016-05-16 12:00:29 -07:00
Henry
54a0de4a08
[New Edit Mode] #636 Removed edit concerns from DropGesture
2016-05-13 17:59:43 -07:00
Henry
a11dba88b2
[New Edit Mode] #634 Removed edit concerns from MctRepresentation
2016-05-12 20:23:33 -07:00
Henry
d08cdfba49
Fixed linting issues
2016-05-12 16:50:19 -07:00
Henry
ffacf6e1ae
Resolved residual merge issue
2016-05-12 16:18:48 -07:00
Henry
69c4c3a2c8
Added tests
2016-05-12 16:14:42 -07:00
Henry
c305fba0a7
Modified dirty function
2016-05-12 16:14:42 -07:00
Henry
44f4a82fa1
Resolved merge conflicts
2016-05-12 16:14:31 -07:00
Henry
5bf750c90c
Fixed creation
2016-05-12 16:11:57 -07:00
Henry
836b5db8cf
Reviewed edit mode checking
2016-05-12 16:11:57 -07:00
Henry
1753a5473c
Resolved merge conflicts
2016-05-12 16:11:52 -07:00
Henry
d00e13e4ee
Resolved merge conflicts
2016-05-12 16:09:53 -07:00
Henry
4b786d3536
Removed sysouts
2016-05-12 16:09:08 -07:00
Henry
e6bbc3442b
Resolved merge conflicts
2016-05-12 16:09:02 -07:00
Henry
433dd87e51
Resolved merge conflicts
2016-05-12 16:07:39 -07:00
Henry
cf9eb3f602
Resolved Merge conflicts, removed previously deleted files
2016-05-12 16:05:27 -07:00
Henry
bd686790dc
Resolved merge conflicts
2016-05-12 16:03:19 -07:00
Henry
e5ef7c0c22
Resovled merge conflicts
2016-05-12 15:58:17 -07:00
Victor Woeltjen
3d891073da
[Popup] Add method to jqlite mocks
...
...to resolve build failure preventing merge,
https://github.com/nasa/openmct/pull/922#issuecomment-218588876
2016-05-11 14:25:23 -07:00
Victor Woeltjen
116c6e57ed
Merge pull request #918 from nasa/rt-updates-910
...
[Table] Remove length check when updating visible rows
2016-05-11 14:07:27 -07:00
Charles Hacskaylo
73c2c01def
[Frontend] Layout and styling of Time Conductor
...
open #889
open #298
Fixes for mobile;
Moved popup z-index def into sass;
Datetime picker compressed for
better fit in mobile phone;
Removed hours selector from datetime
picker to enable better fit in mobile;
2016-05-11 11:32:39 -07:00
Charles Hacskaylo
7c82e31b66
Merge branch 'master' into open889
2016-05-10 23:09:59 -07:00
Charles Hacskaylo
a58fe1f81c
[Frontend] Modified .tick-labels in Timelines
...
open #909
- Changed markup to not use plot .tick-label class;
- Changed CSS accordingly;
- Fixed alignment (clipped bottom value) by
refactoring to use flex-box layout for tick labels;
2016-05-10 20:41:52 -07:00
Charles Hacskaylo
2829b8d495
[Frontend] Time Conductor mobile
...
open #889
- Major refactoring of mobile approach,
leveraging flex-box layout change;
2016-05-10 19:52:11 -07:00
