Shivam Dave
c4dd4f5c45
[Mobile] Merge
...
Merged with master.
2015-08-19 11:01:58 -07:00
slhale
33a63947e5
Merge branch 'open70' into search
2015-08-19 10:06:32 -07:00
slhale
432ec519b6
Merge branch 'search' into open70
...
Conflicts:
platform/commonUI/browse/res/templates/browse.html
2015-08-19 10:05:38 -07:00
Charles Hacskaylo
7f65ba236c
[Frontend] Tweaks to Load More results button
...
#70
2015-08-19 09:44:23 -07:00
Charles Hacskaylo
3a86f5e746
[Frontend] Tweak to Load More button label
...
#70
2015-08-18 19:54:50 -07:00
Charles Hacskaylo
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
Victor Woeltjen
097794d94f
[API] Smaller redesign notes
2015-08-18 17:55:15 -07:00
slhale
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
Victor Woeltjen
cd51c359eb
[API] Add notes on bundles to API redesign
2015-08-18 16:37:58 -07:00
Victor Woeltjen
2adf84b082
[API] Add proposal for wrapping Angular services
2015-08-18 16:14:14 -07:00
slhale
9ebc04ef14
[Search] Cleanup and documentation
2015-08-18 16:08:16 -07:00
Victor Woeltjen
4c00d5d58f
[API] Propose view changes
2015-08-18 15:45:36 -07:00
Charles Hacskaylo
e426e0e5ec
Merging in latest from master
...
#70
2015-08-18 15:23:42 -07:00
Victor Woeltjen
844d608fb9
[API] Begin proposing changes
2015-08-18 14:02:30 -07:00
slhale
3d1e1659c2
[Search] Update tests
...
for 100% coverage.
2015-08-18 12:37:47 -07:00
slhale
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
slhale
158f549df2
[Search] Change back bundles.json
2015-08-18 11:48:07 -07:00
slhale
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
slhale
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
Victor Woeltjen
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
Victor Woeltjen
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
Charles Hacskaylo
f4b87cf70d
[Project source] Updated icomoon.io symbols font project file
2015-08-17 15:47:28 -07:00
Victor Woeltjen
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
Charles Hacskaylo
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
Victor Woeltjen
a4e2aba6dc
[Code Style] Add trailing newline
...
WTD-1482.
2015-08-17 15:07:47 -07:00
Victor Woeltjen
f4ae86eb53
Merge remote-tracking branch 'github/master' into open1482c
...
Conflicts:
platform/representation/src/actions/ContextMenuAction.js
2015-08-17 15:05:34 -07:00
slhale
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
slhale
ce58aff18a
[Search] Remove unused code
2015-08-17 14:31:43 -07:00
slhale
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
slhale
eee8790682
[Search] Add tests
...
Added tests for SearchMenuController.
2015-08-17 13:46:28 -07:00
slhale
083932e902
[Search] Moved search menu to a template
...
Created a search-menu template and corresponding controller.
Moved functions out of SearchController to SearchMenuController.
The two controllers share information through ngModel.
2015-08-17 12:34:50 -07:00
Pete Richards
9ab06cfdd2
Merge remote-tracking branch 'github-open/open1506' into open-master
2015-08-17 11:48:23 -07:00
slhale
e159b7a15d
[Search] mct-control textfield breaks focus
...
Set up bundle.json so that the search bar could
be a mct-control, but left the control itself
commented out because then CSS styling would not
work due to lack of access to parent elements.
2015-08-17 11:47:40 -07:00
Victor Woeltjen
4481c44c4b
[Code Style] Refactor search to use prototypes
...
WTD-1482.
2015-08-17 11:20:23 -07:00
slhale
6d660d48ca
[Search] Change default search menu
...
The search menu now opens to having none of the types
checked, but 'ALL' checked. Checking anything besides
'ALL' unchecks 'ALL' and begins filtering search by
type.
2015-08-17 11:17:02 -07:00
Victor Woeltjen
bf417a14e0
Merge remote-tracking branch 'origin/open-master' into open1482c
...
Merge latest into topic branch for WTD-1482
2015-08-17 11:01:39 -07:00
Victor Woeltjen
4495c5b64a
[Build] Restore snapshot status
...
Bump version number and restore snapshot status to
begin sprint Umbriel, WTD-825.
2015-08-17 10:54:30 -07:00
Shivam Dave
0cee5ad380
Merge remote-tracking branch 'upstream/master'
2015-08-17 10:50:19 -07:00
Victor Woeltjen
f22c0a7ee4
[Search] Remove unused dependency
...
Remove unused dependency from generic search worker,
avoids WTD-1511.
2015-08-17 10:50:12 -07:00
Victor Woeltjen
83fce6ad77
[Search] Remove unused dependency
...
Remove unused dependency from generic search worker,
avoids WTD-1511.
2015-08-17 10:45:02 -07:00
slhale
7b4934ec55
[Search] Shorter menu transition
2015-08-17 10:33:26 -07:00
slhale
2ef0c2a8cb
[Search] Documentation
...
More specific descriptions of angular scope
variables in searchcontroller.
2015-08-17 10:33:10 -07:00
Victor Woeltjen
d46eea64e4
Merge remote-tracking branch 'github/api-redesign' into api-redesign
...
Conflicts:
docs/src/design/proposals/APIRedesign.md
2015-08-17 09:56:46 -07:00
Victor Woeltjen
4d4fe7f626
[API] Incorporate newer feedback
2015-08-17 09:49:34 -07:00
Victor Woeltjen
12760b63b9
[API] Add additional feedback
2015-08-17 09:38:30 -07:00
slhale
80c99d2eb6
Merge branch 'master' into search
2015-08-17 09:35:30 -07:00
Victor Woeltjen
2ccca016a5
[Code Style] Use prototypes in telemetry bundle
...
WTD-1482
2015-08-14 16:55:17 -07:00
slhale
cb0f72052f
[Search] Update tests
...
Changed references to isLoading to
mockScope.loading
2015-08-14 16:46:22 -07:00
slhale
1030eff943
[Search] Documentation
2015-08-14 16:44:34 -07:00
slhale
5e3caf6252
[Search] Shorter menu transition
2015-08-14 16:35:14 -07:00
