Sheshank Shankar
58ddff4001
Fix #1649 : Edit Scratch Conf Website - Correct Info for Costa Rica Conf ( #1650 )
...
* Adds fix to #1644
* Update l10n.json
* Add files via upload
* Add files via upload
* Delete index.jsx
* Delete index.scss
* Delete l10n.json
* Update index.jsx
* Update l10n.json
* Update l10n.json
* Update index.jsx
2017-11-07 16:42:53 -05:00
chrisgarrity
4fe3997df4
Top and middle banners for HoC 2017
...
Css animated top banner
Middle banner of activities - responsive
https://github.com/LLK/scratchr2/issues/4869
Also updated ttt see-more/open- modal link to be consistent with the new icon from Carl.
2017-11-03 16:50:26 -04:00
Matthew Taylor
7e00d40325
Merge pull request #1647 from LLK/release/2.2.26
...
[Develop] Release 2.2.26
2017-11-03 12:04:11 -04:00
Matthew Taylor
eef64e139e
Merge pull request #1648 from LLK/release/2.2.26
...
[Master] Release 2.2.26
2017-11-03 12:04:00 -04:00
Matthew Taylor
a87b7dc3fa
Merge pull request #1653 from mewtaylor/issue/gh-1652
...
Fix GH-1652: resolve typo in social message count name
2017-11-03 10:17:11 -04:00
Matthew Taylor
8489918805
resolve typo
...
I think this happened when I was resolving a merge conflict, and I confused the naming from previous/new along the way. Thanks @jwzimmer!
Fixes #1652
2017-11-03 10:16:01 -04:00
Matthew Taylor
05bdcc74e0
Merge pull request #1639 from mewtaylor/issue/gulptea-avatar
...
Point at GulpTea’s avatar in credits page
2017-10-30 10:36:48 -04:00
Matthew Taylor
a1da26b0c9
Point at @GulpTea’s avatar
2017-10-30 08:39:42 -04:00
Matthew Taylor
18f82fce3f
Merge branch 'issue/gh-1546' into develop
...
* issue/gh-1546:
Make api request on filter change
render load more even if messages not there
# Conflicts:
# src/views/messages/container.jsx
# src/views/messages/presentation.jsx
2017-10-26 08:41:54 -04:00
Matthew Taylor
361afaa937
Make api request on filter change
...
This fixes #1546 by using an updated api endpoint that accepts filter arguments.
2017-10-24 13:10:32 -04:00
jwzimmer
44bb646ab2
removed redundant require statements
2017-10-24 11:38:07 -04:00
jwzimmer
2813218dc9
added signing out from discuss (scratchr2)
2017-10-23 21:39:33 -04:00
jwzimmer
658a65c807
add findText helper function, add test for signing out of homepage
2017-10-23 21:17:55 -04:00
jwzimmer
79499b677f
Updated selenium & chromedriver versions, which fixed test failures in test_footer_links. Also fixed the clickFooterLinks function so it only checks links in the footer, to remove false positives (e.g. test finds 'Tips' in navbar and passes).
2017-10-23 20:15:37 -04:00
The_Grits
cfa55d98e8
Fix gh-1588: Localize "it's free!" String ( #1594 )
...
* Add it's free string
* Add it's free string into page
* Update presentation.jsx
2017-10-23 11:11:33 -04:00
KT
16f312b0fa
Fix #1612 ( #1616 )
...
* Adding new mods and moving others to "Previous MIT Scratch Team Members" maintaining alphabetical order
2017-10-12 08:26:47 -04:00
Ken
b2e7d57f5a
Resolves #1614 ( #1615 )
...
Email Settings -> Email
2017-10-11 17:07:48 -04:00
Matthew Taylor
a1675cbb7d
hide overflow on comment component ( #1611 )
...
fixes #1568 by imposing a hidden state on overflow text.
2017-10-11 10:09:02 -04:00
Sheshank Shankar
5321712a25
Fix typos in Teacher Accounts FAQ. Resolves GH-1608
2017-10-09 13:49:19 -04:00
Sheshank Shankar
ce7bcd3409
Fix typos in FAQ. Resolves GH-1604
2017-10-08 11:00:31 -04:00
Sheshank Shankar
d99f503002
Fix typo in FAQ. Resolves GH-1601
2017-10-08 10:13:31 -04:00
KT
0301618b9c
Updates to community moderation listing. Resolves GH-1442 Resolves GH-1596
...
* Removing moderator job listing
* Update moderator.jsx
2017-10-08 10:00:09 -04:00
Ken
36cb865f89
Fix TOS and messages typos. Resolves GH-1593 Resolves GH-1595
...
* fix typo
"many not" -> "may not"
* Fix typo in l10n.json while I'm at it
2017-10-08 09:58:06 -04:00
Sheshank Shankar
5f4256e7d7
Add Link to profile pic ( #1576 )
...
* Add Link to profile pic
* Update comment-message.jsx
* Double-Quotes to Single-Quotes
* fix indentation
* Update comment-message.jsx
* Update comment-message.jsx
* Update comment-message.jsx
2017-10-04 15:58:24 -04:00
Matthew Taylor
bd8c3d6dd0
Merge pull request #1591 from mewtaylor/hotfix/message-count-endpoint
...
[Master] Hotfix: change message count endpoint
2017-10-03 17:25:44 -04:00
Matthew Taylor
161f50611c
Merge pull request #1590 from mewtaylor/hotfix/message-count-endpoint
...
[Develop] Hotfix: change message count endpoint
2017-10-03 16:49:07 -04:00
Matthew Taylor
75217978c1
Switch message count to new endpoint
2017-10-03 16:37:00 -04:00
Matthew Taylor
2830257b17
Merge pull request #1589 from LLK/release/2.2.25
...
[Develop] Release 2.2.25
2017-10-03 15:14:26 -04:00
Matthew Taylor
ea1b4248e4
Merge pull request #1562 from LLK/release/2.2.25
...
[Master] Release 2.2.25
2017-10-03 15:05:08 -04:00
Matthew Taylor
37131df008
Handle message count split in container
...
Fixes issue where admin messages caused social messages to display as unread when they weren’t
2017-10-03 12:53:49 -04:00
Matthew Taylor
d272a2e4e6
Handle case of messages length being less than unreadcount
...
this fixes #1561 by making sure that if the count is retrieved before the messages themselves, there is no error in the console.
2017-10-02 10:33:53 -04:00
chrisgarrity
6d0b064c12
Merge pull request #1578 from chrisgarrity/hotfix/pt-br
...
Hotfix/pt br
2017-09-27 07:03:15 -04:00
chrisgarrity
13284dee21
Rename AnimateYourNameGuide to NameGuide
...
remove obsolete static URL so localizations get picked up correctly.
git-ignore localized-urls.json as it’s pulled from scratch-resources now.
2017-09-26 16:56:34 -04:00
chrisgarrity
8b055d894c
follow injectIntl convention
...
wrap the createClass with injectIntl to be consistent with other uses in www
2017-09-26 16:54:09 -04:00
chrisgarrity
b48411a8e4
Link to pt-br downloads if locale is pt-br
2017-09-26 16:53:46 -04:00
chrisgarrity
2d9056d5af
Merge pull request #1571 from chrisgarrity/gh1570-fix-name-guide
...
Rename AnimateYourNameGuide to NameGuide
fixes #1570
2017-09-26 15:12:21 -04:00
Sheshank Shankar
e8671c1727
Add Tina Quach to Credits. Resolves GH-1572
...
* Add Tina Quach to Credits
* Update credits.jsx
* Update credits.jsx
2017-09-26 11:10:58 -04:00
chrisgarrity
1d08a9e201
Rename AnimateYourNameGuide to NameGuide
...
remove obsolete static URL so localizations get picked up correctly.
git-ignore localized-urls.json as it’s pulled from scratch-resources now.
2017-09-25 17:16:58 -04:00
Andrew Sliwinski
72d934e8df
Merge pull request #1567 from VutonDesign/develop
...
Fixing some grammar mistakes in markdown files.
2017-09-24 18:11:03 -04:00
Vuton Design
b47ad7a73f
Should be a capital 🖌️
2017-09-24 22:44:46 +01:00
Vuton Design
d95b36540e
Just noticed that was an oxford comma
2017-09-24 22:26:50 +01:00
Vuton Design
46db5a225b
Fixing a mistake
2017-09-24 22:19:30 +01:00
Vuton Design
833905add3
Fixing grammar mistakes
2017-09-24 22:03:46 +01:00
Vuton Design
d374fed9f4
Fixing some more grammar mistakes
2017-09-24 22:01:42 +01:00
Andrew Sliwinski
d542f18e74
Merge pull request #1552 from VutonDesign/patch-1
...
Rewording | 10n.json
2017-09-20 07:57:38 -04:00
Matthew Taylor
c9eacf4ac3
Merge pull request #1559 from mewtaylor/issue/gh-1545
...
Fix GH-1545: add `unread` as a key/value on each message
2017-09-19 17:18:42 -04:00
Matthew Taylor
129042fce6
Merge pull request #1553 from mewtaylor/issue/gh-1455
...
GH-1455: apply path explicitly rather than in `defaults`
2017-09-19 17:14:00 -04:00
Matthew Taylor
a9cb7bbd99
don’t iterate over list if no filter applied
...
thanks @chrisgarrity !
2017-09-19 17:11:46 -04:00
chrisgarrity
5f48fc13e8
Link to pt-br downloads if locale is pt-br ( #1558 )
...
* Link to pt-br downloads if locale is pt-br
2017-09-19 11:56:30 -04:00
Matthew Taylor
9b3b1a2623
render load more even if messages not there
...
This handles #1546 by still checking about whether to display the loadMore button even if messages are not present (i.e. if a subfilter has no messages present).
2017-09-19 10:30:14 -04:00
