Commit graph

18430 commits

Author SHA1 Message Date
Sam
ed750cac39 FIX: if badges are disabled badge pages should 404 2016-03-29 17:21:32 +11:00
Sam
adbc22530c FIX: don't show badges in summary page if badges disabled 2016-03-29 17:12:15 +11:00
Sam
24630f6b54 update puma dependency 2016-03-29 17:12:15 +11:00
Guo Xiang Tan
2af4e4152e Update Logster. 2016-03-29 14:02:34 +08:00
Sam
7ab153dac3 FIX: double XHR request when loading more badges 2016-03-29 16:56:29 +11:00
Sam
418bc4a844 FIX: when ensuring consistency also delete orphan badges 2016-03-29 16:41:03 +11:00
Sam
6bb97dcabb FIX: external hyperlinks broken in badge cards
also, we were allowing nesting of A tags which is not really allowed
2016-03-29 16:21:52 +11:00
Sam
7cd56e616b FIX: strip out links from badge titles 2016-03-29 16:21:52 +11:00
Guo Xiang Tan
8e4e545929 Bump onebox. 2016-03-29 09:35:22 +08:00
Sam
c650c2a16f FIX: regression in badge grant admin page 2016-03-29 07:58:45 +11:00
Sam
e364eb2aad correct coloring for user nav 2016-03-29 07:53:03 +11:00
Robin Ward
b2f402dc04 FIX: Incorrect badge counts when restricted to a username 2016-03-28 15:17:24 -04:00
Jeff Atwood
a307689621 slightly better avatar missing copy 2016-03-28 12:04:27 -07:00
Sam
68fd1d790b Merge pull request #4119 from techAPJ/badge-fix
FIX: badge display name should be translated from server.en.yml file
2016-03-29 05:43:15 +11:00
Jeff Atwood
c53ef51c91 some badge image layout fixes 2016-03-28 11:40:04 -07:00
Arpit Jalan
bae836c7c5 FIX: badge display name should be translated from server.en.yml file 2016-03-28 23:59:53 +05:30
Arpit Jalan
b6a0b891b8 Update Translations 2016-03-28 23:34:04 +05:30
Arpit Jalan
e29806b9d3 UX: center align exceptions page button on mobile 2016-03-28 22:42:51 +05:30
Robin Ward
ef4877e009 FIX: Stability issues with multiple polls 2016-03-28 12:17:37 -04:00
Arpit Jalan
6b01287e98 Update Translations 2016-03-28 14:00:18 +05:30
Sam
fe51f84aa7 FEATURE: allow admins to enter badge long descriptions
FIX: fallback to description if badge long description is missing

Also moves all badge localization into server.en, this slims the client down

serializers pass down localized names/descriptions/long descriptions
2016-03-28 18:38:57 +11:00
Jeff Atwood
94f831f7e7 more mobile badge tweaks 2016-03-27 23:39:56 -07:00
Jeff Atwood
f9f84620d1 prevent cancel button wrapping on mobile, try 2 2016-03-27 23:21:26 -07:00
Sam
236d8193bd annotate models 2016-03-28 15:21:45 +11:00
Sam
4da9a434fd Merge branch 'master' of github.com:discourse/discourse 2016-03-28 15:16:51 +11:00
Guo Xiang Tan
6d64b6d39f FIX: Query for category hashtag should be case sensitive. 2016-03-28 11:15:10 +08:00
Guo Xiang Tan
c7906d5a74 Merge pull request #4118 from gdpelican/chore/ignore-byebug-history
Add .byebug_history to gitignore
2016-03-28 08:29:28 +08:00
James Kiesel
0aa6dbaa59 Add .byebug_history to gitignore 2016-03-28 07:27:09 +13:00
Jeff Atwood
9cc41dea7f modernize user agent "is mobile" test strings 2016-03-27 10:28:18 -07:00
Jeff Atwood
0f11bc0beb fix tests 2016-03-27 09:58:16 -07:00
Jeff Atwood
c417697091 remove unnecessary mobile onebox border 2016-03-27 09:47:31 -07:00
Jeff Atwood
b3a028acc0 remove built-in support for bbcode size 2016-03-27 09:29:27 -07:00
Jeff Atwood
0a05c9ee8d remove unnecessary mobile user page padding 2016-03-26 02:11:22 -07:00
Jeff Atwood
ac6d38ab34 radically simplify our mobile user agent detection 2016-03-26 02:02:23 -07:00
Jeff Atwood
1b4b361841 normalize topic map button color on mobile 2016-03-26 01:51:31 -07:00
Jeff Atwood
04f68f6277 make badges work better on mobile 2016-03-26 01:30:20 -07:00
Jeff Atwood
b83861325e tighten submit button spacing on mobile too 2016-03-26 01:18:16 -07:00
Jeff Atwood
4f061ee444 no width on submit-panel helps small phones 2016-03-26 01:16:57 -07:00
Guo Xiang Tan
9a5ded48cf FIX: Return a proper error message when sync sso fails. 2016-03-26 13:30:15 +08:00
Arpit Jalan
4648c0ee19 FIX: description for custom badges were not showing up 2016-03-26 09:47:05 +05:30
Guo Xiang Tan
ef6536453b UX: Logs notice close button not positioned properly. 2016-03-26 11:51:11 +08:00
Guo Xiang Tan
8a8d931688 UX: Buttons not positioned within form. 2016-03-26 10:25:33 +08:00
Jeff Atwood
483c19199e slightly shorter badge copy 2016-03-25 16:31:38 -07:00
Robin Ward
96b765d1e6 FIX: Broken link 2016-03-25 17:34:09 -04:00
Jeff Atwood
b4d3973aa1 add success color to check on badges 2016-03-25 14:03:00 -07:00
Robin Ward
d493702a90 FIX: For real this time :'( 2016-03-25 16:29:29 -04:00
Robin Ward
4cca4f2f5b FIX: Typo 2016-03-25 16:20:59 -04:00
Robin Ward
83b79a4e1e UX: Show a user's badges as cards 2016-03-25 16:10:38 -04:00
Arpit Jalan
64feffbb60 FEATURE: site setting for suppressing categories from digest email 2016-03-26 01:06:03 +05:30
Robin Ward
27c793a990 UX: Show badges as cards on the badges index and show page 2016-03-25 15:33:06 -04:00