Commit graph

18358 commits

Author SHA1 Message Date
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
Arpit Jalan
fc9519af52 Merge pull request #4117 from techAPJ/invite-email
UX: user invite email style should be consistent with other user notifications
2016-03-25 23:15:52 +05:30
Robin Ward
207bf1b339 FIX: Broken Javscript test 2016-03-25 12:54:33 -04:00
Robin Ward
5f54dd908a Recategorize link badges 2016-03-25 12:21:24 -04:00
Robin Ward
56c13856dd Move Editor and First Flag to "Getting Started" category 2016-03-25 12:19:12 -04:00
Robin Ward
2c5eed9a85 FIX: Basic badge description was missing 2016-03-25 12:11:39 -04:00
Robin Ward
ba10327cc8 FIX: Minor badge page issues 2016-03-25 12:11:39 -04:00
Robin Ward
d7b568f98e REFACTOR: Remove view from badges-show 2016-03-25 12:11:39 -04:00
Robin Ward
d129c61a4a FIX: Badge loading more was stuck 2016-03-25 12:11:39 -04:00
Régis Hanol
9e9c81c30b improve error log when timing out while connecting to mail server 2016-03-25 16:44:08 +01:00
Arpit Jalan
17afdc34cc UX: user invite email style should be consistent with other user notifications 2016-03-25 19:28:55 +05:30
Jeff Atwood
92551df979 de-emphasize user page nav a bit from pure black 2016-03-25 00:46:36 -07:00
Jeff Atwood
f0c022351d de-line the badge page a bit 2016-03-24 15:47:00 -07:00
Jeff Atwood
9bd8ea4633 more long badge descriptions 2016-03-24 15:06:35 -07:00
Robin Ward
d1e1a91cb6 FIX: Large widths, weird button floating on badge view 2016-03-24 17:20:49 -04:00
Jeff Atwood
2c2a043525 unify badge count info 2016-03-24 13:00:10 -07:00
Robin Ward
e51259ee7b FIX: Broken test 2016-03-24 13:50:45 -04:00
Robin Ward
db15772ab1 UX: Make user info rendering more consistent 2016-03-24 13:49:35 -04:00
Neil Lalonde
476a5fd43c FIX: unhandled extensions like .php on static routes will show the usual not found page 2016-03-24 13:22:06 -04:00
Robin Ward
e407ef9d0e FIX: Also support nil values for the site settings 2016-03-24 11:14:17 -04:00
Robin Ward
b270e0142b FIX: If site settings are missing don't do anything 2016-03-24 11:12:54 -04:00