Commit graph

11139 commits

Author SHA1 Message Date
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
Matthew Taylor
4fa3c0f761 Merge pull request #1551 from mewtaylor/issue/gh-1540
Fix GH-1540: Direct studio activity link to the activity tab
2017-09-19 10:18:18 -04:00
Matthew Taylor
8c631b40d9 add unread as a key/value on each message
This fixes #1545 by adding unread as a key/value on each message during the filtering process. This means the unread count is always applied to the list of full messages, and never to a subset (as was happening before to cause #1545).
2017-09-19 10:13:52 -04:00
Matthew Taylor
9a3358b35c provide a default opts if it’s undefined 2017-09-18 14:40:52 -04:00
Ray Schamp
5245123a4c Merge pull request #1555 from rschamp/hotfix/qa-engineer
[Develop] Add QA Engineer posting
2017-09-18 14:16:19 -04:00
Ray Schamp
4e49653fcc Merge pull request #1554 from rschamp/hotfix/qa-engineer
[Master] Add QA Engineer posting
2017-09-18 14:16:10 -04:00
Ray Schamp
62ad6ff51f Add QA Engineer posting 2017-09-18 11:48:01 -04:00
Matthew Taylor
4175c119d2 apply path explicitly rather than in defaults
This should fix #1455 by preventing the path from being changes via opts passed in, even though we don’t pass in a `path` anywhere.
2017-09-18 11:44:06 -04:00
Vuton Design
20ce38e8d0 Update l10n.json 2017-09-16 09:30:34 +01:00
Linda
e119cea627 Fixes GH-1435/Reduce work for translators on credits page (#1514)
* Fixes GH-1435/Make as many names as possible on credits page non-translate

* fixed the travis error that occured before
2017-09-15 17:24:41 -04:00
Matthew Taylor
1335de9b57 Direct studio activity link to the activity tab
Fixes #1540 by ensuring that the anchor link for studio activity is directed to the activity tab of the studio
2017-09-15 15:49:57 -04:00
LiFaytheGoblin
aa8efd0bc9 fixed the travis errors that occured earlier 2017-09-15 14:34:21 +02:00
Matthew Taylor
57749008c6 Merge pull request #1541 from mewtaylor/issue/manager-thumbnail-activity
[Master] Hotfix: use recipient thumbnail, not actor for manager activity
2017-09-13 14:48:06 -04:00
Matthew Taylor
426259fbe8 Merge pull request #1542 from mewtaylor/issue/manager-thumbnail-activity
[Develop] Hotfix: use recipient thumbnail, not actor for manager activity
2017-09-13 14:11:50 -04:00
Matthew Taylor
d4b0207bb0 clean up stuff 2017-09-13 13:51:17 -04:00
Matthew Taylor
98cbfd638f use recipient thumbnail, not actor for manager activity
Fixes an issue where the thumbnail mismatches the username presented
2017-09-13 13:47:27 -04:00
Matthew Taylor
16a5208624 Merge pull request #1477 from Petroochio/IS-1195-radio-button-tabbing
Fix issue 1195 registration gender tabbing
2017-09-13 08:26:37 -04:00
Matthew Taylor
556b527dc3 Merge pull request #1529 from towerofnix/fix-class-typo
Fix CSS class of forum post message row
2017-09-13 08:18:43 -04:00
Matthew Taylor
2034edb82f Merge pull request #1532 from mewtaylor/hotfix/highlight-unread-rows
[Master] Hotfix: highlight unread message row in light blue
2017-09-11 10:50:05 -04:00
Matthew Taylor
94ce746f9b Merge pull request #1533 from mewtaylor/hotfix/highlight-unread-rows
[Develop] Hotfix: highlight unread message row in light blue
2017-09-11 10:16:04 -04:00
Matthew Taylor
057f741f89 highlight unread message row in light blue
This addresses issues with seeing unread notifications by highlighting them as light blue, along with more opaque icons
2017-09-11 09:59:24 -04:00
Florrie
14fd4e9a5b Change CSS class .mod-studio-activity to .mod-forum-activity in forum post message row 2017-09-10 10:11:27 -03:00
Matthew Taylor
e2eb7eb788 Merge pull request #1524 from mewtaylor/hotfix/fix-interval
[Master] fix parentheses around interval
2017-09-09 17:15:33 -04:00
Matthew Taylor
9f3b0c903e Merge branch 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www into develop
* 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www:
  remove debug message
2017-09-09 17:00:39 -04:00
Matthew Taylor
a90dd6e296 remove debug message 2017-09-09 16:59:39 -04:00
Matthew Taylor
88ea667f8c Merge branch 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www into develop
* 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www:
  call as anonymous method
2017-09-09 16:56:05 -04:00
Matthew Taylor
ffa6b7d376 call as anonymous method 2017-09-09 16:55:43 -04:00
Matthew Taylor
35ab2ebe48 Merge pull request #1525 from mewtaylor/hotfix/fix-interval
[Develop] fix parentheses around interval
2017-09-09 16:03:53 -04:00
Matthew Taylor
7917f15874 fix parentheses around interval 2017-09-09 15:56:01 -04:00
Matthew Taylor
2a48f8a9a2 Merge pull request #1523 from LLK/release/messages-page
[Develop] Release: new notifications page
2017-09-09 01:07:59 -04:00
Matthew Taylor
42006a889a Merge pull request #1522 from LLK/release/messages-page
[Master] Release: new notifications page
2017-09-08 21:04:52 -04:00
Matthew Taylor
d18fd0064b change width to min-width on icon
fixes #1521 but no idea why **shrug**
2017-09-08 18:09:55 -04:00
Matthew Taylor
1f722a046f resize svgs 2017-09-08 16:37:18 -04:00
Matthew Taylor
92ed6adead fix typo
thanks @jwzimmer!
2017-09-08 16:08:53 -04:00
Matthew Taylor
026c035af3 adjust line-height for notifications
this applies to the comments only
2017-09-08 14:24:59 -04:00
Matthew Taylor
9e3823e6e7 add icons to social message notifications 2017-09-08 14:10:46 -04:00
Matthew Taylor
1dffc08445 change the way invites are assigned
assign invites directly to the state rather than by defaults in order to ensure empty objects can be part of an update
2017-09-08 10:24:39 -04:00
Matthew Taylor
7e85d2c731 fix invite for initial 2017-09-08 09:38:47 -04:00
Matthew Taylor
b82d312dd8 make invite an array instead of an object
When trying to clear the invite, because invite is currently an object, it’s getting the state’s existing invite re-applied via `defaultsDeep`. Making it an array should solve this issue
2017-09-08 09:29:46 -04:00
Andrew Sliwinski
af0f0d30a1 Merge pull request #1513 from thisandagain/bugfix/1509
Changed 'Animate a Name' educator guide link
2017-09-07 15:59:09 -04:00