Commit graph

30 commits

Author SHA1 Message Date
Matthew Taylor
cbd983baf8 Merge pull request #932 from TheGrits/patch-3
Fix gh-678: Retain Search Term
2016-12-12 22:52:38 -05:00
The_Grits
0b2c1fff1a Squish 2016-12-12 16:01:06 -05:00
Matthew Taylor
6309c30667 Merge branch 'release/hoc-nov-21' of https://github.com/LLK/scratch-www into develop
* 'release/hoc-nov-21' of https://github.com/LLK/scratch-www:
  Match tutorial ordering to ttt top row
  Turn off related videos in embed
  Move margin to flex-row element
  Add finalized video
  Add event row text
  Add temporary video for testing
  Add windows device manager url
  Add `ignoreUrls` to max-len lint rules
  switch to column in tablet
  Add hoc event row
  Update wedo2 text for new Windows deploy
  Add “open” string to l10n.json
  Add link to TTT page to educators page
  Add hoc banner
  Move padding to splash element
  trello-ize title banner h1,p styling

# Conflicts:
#	src/views/explore/explore.jsx
#	src/views/search/search.jsx
2016-12-02 10:55:38 -05:00
The_Grits
52a57b05a7 Localize Search Header 2016-11-22 12:15:17 -05:00
Matthew Taylor
fe70dd0f9e trello-ize title banner h1,p styling
we need it to be different for the hoc banner, so make it need a class name in order to be styled correctly
2016-11-16 08:50:00 -05:00
The_Grits
5fb1dd6230 Thanks Travis
A more thorough search of the error Travis returned helped me realize the problem.
2016-11-09 12:48:39 -05:00
The_Grits
2c1106adf7 Fix Travis 2016-11-07 11:12:59 -05:00
The_Grits
bfc0b5994e gotcha 2016-11-07 11:09:44 -05:00
The_Grits
d9df101a66 One Commit More (#23)
* Update reducer.js

* Update search.jsx
2016-11-07 11:02:33 -05:00
The_Grits
8be3e11486 Travis and Other Stuffs 2016-10-31 10:19:35 -04:00
The_Grits
9f2cda0eaa Bugs and Connections 2016-10-31 10:05:08 -04:00
The_Grits
379ac78551 Navigation Redux 2016-10-26 10:20:16 -04:00
The_Grits
f77b22b07b Update with Reducer 2016-10-20 21:30:32 -04:00
Technoboy10
3777ab825c make fix simpler by using value instead of defaultValue 2016-10-20 13:17:23 -06:00
Technoboy10
4a610296e2 Add check for undefined formData 2016-10-12 16:09:00 -06:00
Technoboy10
55f95bb2a8 remove inactive class on tabs 2016-08-23 09:26:22 -06:00
Technoboy10
647c925a1c search redesign 2016-08-23 09:26:22 -06:00
Matthew Taylor
27b5afddfb Forgot search
thanks @thisandagain!
2016-07-11 19:59:13 -04:00
Matthew Taylor
7f466aacc6 Add language to search / explore api requests
Fixes #686, thanks @thisandagain !
2016-07-07 08:38:10 -04:00
Ray Schamp
dffea48299 Fixup api refactor
Updates after a rebase
2016-06-14 17:33:54 -04:00
Matthew Taylor
b065ed5254 quick formatting fix for box header on search 2016-06-09 07:57:41 -04:00
Matthew Taylor
9fad938eb8 Add localizations, minor style changes 2016-06-09 07:32:25 -04:00
Rachel Thornton
9c6475aed5 Support for studios
Search and Explore now support studios, thought currently the api is
not ready for them.
2016-05-10 08:16:46 -04:00
Rachel Thornton
d7c9057cbd Refactoring, new grid component
Significant refactoring of Explore and Search pages, including new grid
component for displaying projects
2016-05-10 00:54:46 -04:00
Rachel Thornton
fdd78a5433 Style changes
Changes to style for lint tests
2016-04-30 16:38:48 -04:00
Rachel Thornton
eb499c929c Changed path of search page to allow for studio tabs
Users and Forum tabs removed
2016-04-30 16:03:11 -04:00
Rachel Thornton
e2a7698cde Changes to path for search results
No longer uses google_results in url
Also now has correct link to project page from clicking on projects in
explore and search
2016-04-30 14:50:11 -04:00
Rachel Thornton
bca374b88f Merged changes to routing, separated Tabs into a component 2016-04-30 14:07:11 -04:00
Rachel Thornton
74a6d132bd Search page functions 2016-04-30 11:44:10 -04:00
Rachel Thornton
dfa7b9e582 Starting mock of search page 2016-04-18 16:51:45 -04:00