Commit graph

9192 commits

Author SHA1 Message Date
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
Jeff Atwood
3793a2e06d add glyphs to user page API buttons 2014-05-17 01:02:30 -07:00
Jeff Atwood
5cd588c375 add glyph to API master key button 2014-05-17 00:57:01 -07:00
Jeff Atwood
1f0f71df65 add glyphs to API buttons 2014-05-17 00:54:20 -07:00
Jeff Atwood
31aea668e0 improve /top redirect copy in English master 2014-05-16 16:25:28 -07:00
Jeff Atwood
49bd865a83 improve /top redirect copy 2014-05-16 15:01:52 -07:00
Jeff Atwood
99f9140147 add glyph to "must be signed in" sign in btn 2014-05-16 14:57:30 -07:00
Robin Ward
275fa02082 Generate compatibility layer for Components too 2014-05-16 16:39:41 -04:00
Robin Ward
aa9e89b6c8 Support for defining components within plugins 2014-05-16 16:10:16 -04:00
Neil Lalonde
09dc3f128f Don't disable the create account button for signups from 3rd parties. Server will return error messages if something is wrong. 2014-05-16 16:01:45 -04:00
Neil Lalonde
68fcb66443 Use Discourse.computed.setting for more better javascript 2014-05-16 15:27:42 -04:00
Robin Ward
a6670c6c83 Convert all initializers to Ember initializers 2014-05-16 14:04:34 -04:00
Robin Ward
a2a07a9852 Allow reply as new topic to use the selected text as a quote. 2014-05-16 12:20:15 -04:00
Neil Lalonde
4ca0a162b4 Add a hint about the fixed_category_positions site setting in the edit category modal. 2014-05-16 11:45:54 -04:00
Neil Lalonde
27cbc06563 Add fixed_category_positions site setting to handle whether categories are ordered by specified positions or by activity. 2014-05-16 11:33:52 -04:00
Robin Ward
417fdeaad8 FIX: Allow clicking on the (+) icon as well as the link to reply as new
topic.
2014-05-16 11:25:49 -04:00
Régis Hanol
4393963d39 Merge pull request #2351 from awesomerobot/master
making onebox styles consistent with quote styles
2014-05-16 16:28:05 +02:00
Kris Aubuchon
1fd6a9067b making onebox styles consistent with quotes 2014-05-16 10:19:02 -04:00
Régis Hanol
3a0b23191c TEMP: disable CORS when using CDN 2014-05-16 15:11:12 +02:00
Régis Hanol
e4125e16e9 Merge pull request #2349 from fantasticfears/align
Align for user dropdown. No badge for zero incoming message.
2014-05-16 14:43:12 +02:00
Erick Guan
60b9c8b79e align for user dropdown. No badge for zero incoming message. 2014-05-16 19:54:58 +08:00