3484b315cf
[Mobile] Sanding of mobile styles, cherry-pick to master
...
open #74
CSS and markup changes for mobile
that are good for master now;
2015-08-20 16:09:35 -07:00
553e226a5d
[API] Add proposal for removing delegation
2015-08-20 14:34:59 -07:00
b1e1e85bbd
Merging in latest openmctweb master
...
open74
Had to resolve conflicts
2015-08-20 10:36:41 -07:00
1e79c507c8
[Build] Ignore Intellij *.iml configuration files
2015-08-20 09:25:27 +02:00
249a9b2eb2
[Frontend] Better sorting indicators added to styles
...
JPL #48
Simplified styles to indicate sort by asc and desc in table th elements;
(cherry picked from commit 15a2416)
2015-08-19 18:17:15 -07:00
02abbdf4fe
Resolving conflict in platform/.../theme-espresso.css
...
#75
Merged in master branch;
Re-rendered platform/.../theme-espresso.css;
2015-08-19 16:22:21 -07:00
08d68f99a5
[Frontend] Fix word wrapping issues in hover bubble
...
#75
CSS modified to utilize word-break property;
2015-08-19 16:09:55 -07:00
f27e4d6e06
Merge branch 'open-master' into open1482c
...
Merge in latest in preparation to merge; WTD-1482
Conflicts:
platform/commonUI/browse/src/creation/CreationService.js
platform/core/src/models/RootModelProvider.js
platform/entanglement/src/services/LinkService.js
platform/entanglement/src/services/MoveService.js
2015-08-19 15:00:52 -07:00
9c578c53db
Merge pull request #64 from nasa/open-965
...
[Location] track location of objects and distinguish links from originals
WTD-965
2015-08-19 14:28:00 -07:00
a4a9acd2ea
Merge branch 'open-master' into open-965
...
Merge in latest into topic branch for WTD-965 to
resolve conflicts.
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
2015-08-19 14:16:56 -07:00
c118234bbf
[Style] Brace after if criteria
2015-08-19 13:55:02 -07:00
dfacf08e45
[API] Propose registering instances
...
WTD-1237
2015-08-19 13:44:34 -07:00
e7fa0e9f21
[API] Add proposal w.r.t. third-party APIs
...
WTD-1237
2015-08-19 13:26:58 -07:00
a94763041e
[Move] correct logic and specification
2015-08-19 13:16:36 -07:00
ccfafb6f89
[API] Add more proposals
...
WTD-1237
2015-08-19 13:07:54 -07:00
26892e7104
[Location] isLink/isOriginal are antonyms
...
Simplify implementation of isLink/isOriginal for better maintainability.
2015-08-19 11:49:45 -07:00
5c74365f4b
[Root] Root model provider sets location
...
Root model provider sets the location of roods so that the location
capability does not need special handling for this.
2015-08-19 11:49:03 -07:00
94854e5965
[Location] can retrieve contextual location
...
Clarify naming of method for retrieving contextual location of a domain
object.
Default behavior for objects that do not have a context is to return
undefined. Note that default behavior is not specified and could change
if needed.
2015-08-19 11:33:45 -07:00
9cf30f4213
[Location] setPrimaryLocation takes location.
...
Rename "persistLocation" to be more clearly named, and make it take an
argument to allow for greater control outside the capability.
2015-08-19 11:25:41 -07:00
eb776e69c0
[JSDoc] Document LocationCapability constructor
2015-08-19 11:13:24 -07:00
c4dd4f5c45
[Mobile] Merge
...
Merged with master.
2015-08-19 11:01:58 -07:00
33a63947e5
Merge branch 'open70' into search
2015-08-19 10:06:32 -07:00
432ec519b6
Merge branch 'search' into open70
...
Conflicts:
platform/commonUI/browse/res/templates/browse.html
2015-08-19 10:05:38 -07:00
7f65ba236c
[Frontend] Tweaks to Load More results button
...
#70
2015-08-19 09:44:23 -07:00
3a86f5e746
[Frontend] Tweak to Load More button label
...
#70
2015-08-18 19:54:50 -07:00
4e3e3653a3
[Frontend] Styling for search elements
...
#70
Significant .scss and markup changes across search;
New symbols font (v2.2) char for clear icon;
To-do: style "load more" element;
2015-08-18 19:51:47 -07:00
097794d94f
[API] Smaller redesign notes
2015-08-18 17:55:15 -07:00
d3ea67fbd9
[Search] Templates vs representations
...
Made the search and search-menu templates into
representations, to be more consistent.
2015-08-18 16:54:36 -07:00
cd51c359eb
[API] Add notes on bundles to API redesign
2015-08-18 16:37:58 -07:00
2adf84b082
[API] Add proposal for wrapping Angular services
2015-08-18 16:14:14 -07:00
9ebc04ef14
[Search] Cleanup and documentation
2015-08-18 16:08:16 -07:00
4c00d5d58f
[API] Propose view changes
2015-08-18 15:45:36 -07:00
e426e0e5ec
Merging in latest from master
...
#70
2015-08-18 15:23:42 -07:00
844d608fb9
[API] Begin proposing changes
2015-08-18 14:02:30 -07:00
3d1e1659c2
[Search] Update tests
...
for 100% coverage.
2015-08-18 12:37:47 -07:00
17f2bb966b
[Search] Update tests and remove redundancy
...
Updated the generic provider test. Removed index
checking from the generic search worker, because
that checking is already done (more efficiently)
in the generic search provider.
2015-08-18 12:27:04 -07:00
158f549df2
[Search] Change back bundles.json
2015-08-18 11:48:07 -07:00
a98b65286f
[Search] Update tests
...
Updated the SearchController tests for more coverage,
due to additions to the controller. Fixed a small
logic error in controller.areMore()
2015-08-18 11:28:12 -07:00
17aa666519
[Search] Remove unnecsissary controller
...
Removed the SearchItemController, as the logic was simple
enough to be done in one line in the search item
representation html.
2015-08-18 10:19:20 -07:00
f6cf4c3215
[Code Style] Fix error in persistence
...
Fix typo in persistence provider for ElasticSearch related
to refactoring to use prototypes, WTD-1482.
2015-08-17 17:00:21 -07:00
86f0a9100f
[Code Style] Fix merge error
...
Fix merge error in ContextMenuAction which caused
test failure. WTD-1482.
2015-08-17 16:57:46 -07:00
f4b87cf70d
[Project source] Updated icomoon.io symbols font project file
2015-08-17 15:47:28 -07:00
841273edf6
[Code Style] Add CONTRIBUTING.md
...
Add CONTRIBUTING.md to formalize changes to code style
requirements for WTD-1482.
2015-08-17 15:22:26 -07:00
366ec3d516
[Frontend] Styles for tabular views and view sections
...
Original issue: https://github.jpl.nasa.gov/MissionControl/vista/issues/30
New CSS and symbols to support tabular views;
Required by JPL branch vista30 (https://github.jpl.nasa.gov/MissionControl/vista/tree/vista30 )
2015-08-17 15:11:27 -07:00
a4e2aba6dc
[Code Style] Add trailing newline
...
WTD-1482.
2015-08-17 15:07:47 -07:00
f4ae86eb53
Merge remote-tracking branch 'github/master' into open1482c
...
Conflicts:
platform/representation/src/actions/ContextMenuAction.js
2015-08-17 15:05:34 -07:00
3a932f5443
[Search] No searching root
...
Removed the root type from the search menu
types, so searches through the current UI
will not reutrn root objects.
2015-08-17 14:32:25 -07:00
ce58aff18a
[Search] Remove unused code
2015-08-17 14:31:43 -07:00
24ee8ec063
[Search] Remove old files
...
Remove old search view files from before
the left tree bar search.
2015-08-17 13:53:37 -07:00
eee8790682
[Search] Add tests
...
Added tests for SearchMenuController.
2015-08-17 13:46:28 -07:00
