Commit Graph

8310 Commits

Author SHA1 Message Date
Neil Lalonde 4d3c19f736 OOPS: fix broken spec 2014-05-20 15:32:42 -04:00
Robin Ward 6dd1880f1f FIX: More safety when displaying link counts on blogs 2014-05-20 15:20:33 -04:00
Neil Lalonde 9445bea530 FIX: add line numbers and file names to generated css 2014-05-20 14:23:50 -04:00
Robin Ward f698ffd522 FIX: Weird back button behavior when going from group members -> profile
and then back.
2014-05-20 13:38:16 -04:00
Robin Ward 18eca4605b Merge pull request #2370 from techAPJ/update-transifex-link
update Transifex project link
2014-05-20 13:17:14 -04:00
Arpit Jalan dbe525b9de update Transifex project link 2014-05-20 22:24:19 +05:30
Robin Ward 8a24a34b1b ES6: More controllers 2014-05-20 12:49:38 -04:00
Robin Ward 29fa2d2fc2 Merge pull request #2355 from vikhyat/poll-plugin
Set up poll plugin javascript using an Ember initializer
2014-05-20 11:25:35 -04:00
Robin Ward 5bbe938e82 FIX: Backwards compatibility layer was not handling constants that ended
with 's'
2014-05-20 11:13:43 -04:00
Jeff Atwood 1ed56eba7a Merge pull request #2366 from riking/patch-5
Allow anonymous to see raw posts
2014-05-20 01:01:15 -07:00
Jeff Atwood ebcfdde752 Merge pull request #2369 from riking/anchors-internal
Consider URLs starting with # as internal
2014-05-20 00:56:38 -07:00
riking 96f97d9d4c Consider URLs starting with # as internal 2014-05-20 00:54:22 -07:00
riking 41332ab7ad Allow anonymous to see raw posts 2014-05-19 23:33:27 -07:00
Jeff Atwood 32000228e6 correct error in CSS 2014-05-19 22:27:33 -07:00
Jeff Atwood f36bdc984d Merge pull request #2364 from riking/patch-4
Remove the special styling on the Categories link
2014-05-19 22:22:47 -07:00
riking 2c6ab4c699 Remove the special styling on the Categories link 2014-05-19 22:21:35 -07:00
Jeff Atwood 6617bfa454 add glyph to Sign In to Reply button 2014-05-19 22:10:47 -07:00
Jeff Atwood 6b864474ea Merge pull request #2363 from awesomerobot/master
some simple style cleanup
2014-05-19 21:43:41 -07:00
Kris Aubuchon 7accf5aafa some simple style cleanup 2014-05-19 23:55:46 -04:00
Sam c1776fa1ae Merge pull request #2360 from vikhyat/badge-system
Badge system updates
2014-05-20 08:24:26 +10:00
Sam 094cee828b Merge pull request #2352 from riking/patch-2
Include pry-rails in production
2014-05-20 08:23:26 +10:00
Jeff Atwood 0e160cc5b3 minor copyedit 2014-05-19 13:51:03 -07:00
Jeff Atwood 9c51d79d81 shorten "all subcategories" 2014-05-19 00:11:32 -07:00
Jeff Atwood b352f70c5c Merge pull request #2357 from techAPJ/master
Update MIGRATION.md
2014-05-18 23:39:53 -07:00
Jeff Atwood 84ead32956 Merge pull request #2361 from awesomerobot/master
making the color customizer a little nicer with dark themes
2014-05-18 22:40:38 -07:00
Vikhyat Korrapati a25087b62a Badges admin UI improvements.
* Query param to allow linking.
* Better handling of deleting unsaved badges.
* New badge list item style improvement.
2014-05-19 10:50:57 +05:30
Kris Aubuchon ffa33c572c making the color customizer a little nicer with dark themes 2014-05-19 01:17:59 -04:00
Vikhyat Korrapati 4de700b49b Change badge user list limit to 96 so that it is divisible by 8. 2014-05-19 10:32:59 +05:30
Vikhyat Korrapati 6b7b328c66 Badges page ordering and titles. 2014-05-19 10:27:09 +05:30
Vikhyat Korrapati 6225b83f4a Show system badges in the admin interface but don't allow editing them. 2014-05-19 10:27:04 +05:30
Sam 8bc8052ab8 BUGFIX: show usernames logic, logic failure 2014-05-19 09:11:01 +10:00
Sam 832a730e36 BUGFIX: re-enable CDN js debugging in a robust way
May be disabled if needed via site setting
2014-05-19 08:46:28 +10:00
Jeff Atwood 5901ed6842 Merge pull request #2358 from fantasticfears/css_tweak
Fix c6ef85d517. Align reply area, 10px padding.
2014-05-18 11:04:43 -07:00
Erick Guan 81dda9fc3e Fix c6ef85d517. Align reply area, 10px padding. 2014-05-19 01:15:11 +08:00
Arpit Jalan 6daffe8e92 Update MIGRATION.md 2014-05-18 16:03:02 +05:30
Sam 9e3c08b5ee Merge pull request #2354 from vikhyat/badge-system
Badge system updates
2014-05-18 20:03:20 +10:00
Jeff Atwood 53aabf9188 Merge pull request #2356 from fantasticfears/css_tweak
User prefrence: align all control groups on top. And some padding for category.
2014-05-18 01:57:07 -07:00
Erick Guan c6ef85d517 User prefrence: align all control groups on top. And some padding for follow category. 2014-05-18 16:34:12 +08:00
Vikhyat Korrapati 5cb2df8f09 Set up poll plugin javascript using an Ember initializer. 2014-05-18 13:36:27 +05:30
Jeff Atwood e94c8b90b8 copyedit trust level badges 2014-05-18 00:55:51 -07:00
Vikhyat Korrapati abd5263671 Load more users on badge pages using infinite scrolling instead of a
button.
2014-05-18 12:42:47 +05:30
Vikhyat Korrapati 8fe8e66280 Don't display system badges in the admin badges interface. 2014-05-18 12:28:14 +05:30
Sam 55e5515657 fallback to email lookup if needed 2014-05-18 11:49:36 +10:00
Sam 4f7e960e49 raw bbpress import script
amend post_creator to support custom fields
2014-05-18 11:33:59 +10:00
Jeff Atwood cf80d2b3fd Merge pull request #2353 from fantasticfears/css_tweak
So sad, reply-new icon is not circle. I can't tolerate this <3
2014-05-17 20:17:52 -07:00
Kane York c03866a5bc Include pry-rails in production 2014-05-17 12:51:02 -07:00
Erick Guan 76e26daf87 So sad, reply-new icon is not circle. I can't tolerate this <3 2014-05-18 00:24:51 +08:00
Jeff Atwood b0ff2b2311 few more glyphs 2014-05-17 01:46:39 -07:00
Jeff Atwood 605cf96923 add some glyphs to new buttons 2014-05-17 01:27:12 -07:00
Jeff Atwood e8d24edd16 shorten settings reset text, add glyph 2014-05-17 01:07:43 -07:00