Commit graph

3111 commits

Author SHA1 Message Date
Robin Ward
f0620a7d21 FIX: Sass helper mismatch 2014-05-28 13:12:34 -04:00
Robin Ward
44cbf73399 Merge pull request #2382 from BenLubar/patch-quotes
quoting fixes
2014-05-28 12:32:18 -04:00
Robin Ward
0542761de4 Minor CSS fixes for Select2 2014-05-28 12:12:31 -04:00
Robin Ward
f8a05195a1 Support images from the select2 plugin 2014-05-28 12:00:58 -04:00
Robin Ward
2164a25258 Merge pull request #2333 from rhacker/select2
feature: use select2 instead of chosen
2014-05-28 11:42:40 -04:00
Boris
66711816cd Group profile page template: add extra class so that we can differentiate group details from user details in CSS
Since the layout of the "user details" section on the Group profile page is very different from a regular User profile page, we need to be able to selectively style the Group profile. Achieve this by adding a CSS flagging class.
2014-05-28 13:27:52 +10:00
Ben Lubar
73946e5402 quoting fixes
- allow bbcode quotes to be nested
- don't allow the '=' to be omitted from quotes
- fix some css that made assumptions about nested quotes
2014-05-27 21:46:31 -05:00
Jeff Atwood
5095de815d Merge pull request #2389 from awesomerobot/master
fixing @mention background in quotes and embeds
2014-05-27 11:03:25 -07:00
Robin Ward
7c22d738b6 FEATURE: Add a location field to a user's profile 2014-05-27 13:54:04 -04:00
Kris Aubuchon
971494bf5a removing max-width on #site-logo from base and putting it back in mobile 2014-05-27 11:58:53 -04:00
Robin Ward
1efa113bea FIX: Don't route to data-share-url 2014-05-27 11:45:45 -04:00
Kris Aubuchon
d6a9f384aa fixing @mention background in quotes and embeds 2014-05-27 11:42:59 -04:00
Robin Ward
663c57a0f0 ES6: Most controllers converted over now. 2014-05-27 10:51:03 -04:00
Sam
0c86d9ed9e BUGFIX: proper multisite support for origin pull CDNs 2014-05-27 23:13:42 +10:00
Sam
18bdc4e63e Add DoS protection to action 2014-05-27 22:29:27 +10:00
Sam
7c6a0c7690 disable avatars mk2 2014-05-27 21:37:42 +10:00
Sam
57176a9f46 Merge pull request #2387 from velesin/wiki_topic_ie_fix
[FIX] Wiki Topic - IE / FF problem with post admin menu.
2014-05-27 20:54:59 +10:00
Sam Saffron
252e93d0f2 BUGFIX: support CDN for avatars
Correct broken spec
Implement S3 support
2014-05-27 14:40:46 +10:00
Vikhyat Korrapati
a79bf11edb Admin badge creation bug fixes. 2014-05-27 09:03:55 +05:30
Sam
504cfcff96 Fix specs for avatars
Implement avatar picker
Correct avatar related jobs
2014-05-27 10:08:03 +10:00
Sam
6c1c8be794 Work in progress, keeping avatars locally
This introduces a new model to store the avatars and 3 uploads per user (gravatar, system and custom)

user can then pick which they want.
2014-05-27 10:08:03 +10:00
Robin Ward
5284fb7cbc New Setting: Don't jump to new posts when replying 2014-05-26 16:39:03 -04:00
Wojciech Zawistowski
d4ae913065 [FIX] Wiki Topic - IE / FF problem with post admin menu. 2014-05-26 22:19:28 +02:00
Robin Ward
919ae73709 ES6: A few more controllers on a Holiday Monday 2014-05-26 14:40:06 -04:00
Jeff Atwood
13ff9980ac Merge pull request #2385 from fantasticfears/css_modal
fix user/username error class
2014-05-26 11:00:41 -07:00
Robin Ward
fc3ce934f5 Show categories on the user streams for topics. 2014-05-26 13:49:57 -04:00
Neil Lalonde
b45e9081ca Merge pull request #2386 from awesomerobot/master
merging more styles into base, also fixing <big> abuse
2014-05-26 12:07:02 -04:00
Kris Aubuchon
9c02ad73ac merging more styles into base, also fixing <big> abuse 2014-05-26 11:33:47 -04:00
Neil Lalonde
8c3770c0b0 Add site setting show_create_topics_notice as a way to hide the 'Create at least 5 topics to get discussion started' message. 2014-05-26 11:20:06 -04:00
Robin Ward
e5a8c606d4 Add primary group class to the username too 2014-05-26 11:14:57 -04:00
Neil Lalonde
c14d754e02 FIX: don't float left all h3's on mobile 2014-05-26 11:00:54 -04:00
Neil Lalonde
96ed5e0e54 FIX: layout problems in composer on mobile 2014-05-26 10:53:05 -04:00
Erick Guan
ecbda44be4 fix user/username error class 2014-05-26 17:46:31 +08:00
riking
2ffea38bb0 Fix up the bind-attr structure 2014-05-25 19:12:28 -07:00
riking
66453c4692 Make timestamp a permalink 2014-05-25 19:10:09 -07:00
Sam
570c4b6300 certain keyboard shortcuts were never tested ever. 2014-05-25 14:59:05 +10:00
Sam
c529cc6f1f wow, just wow, this has been broken for so long 2014-05-25 14:40:39 +10:00
Sam
107003576e Simple workaround for username highlighting for long names 2014-05-25 13:54:52 +10:00
Neil Lalonde
512771932a Show a warning to admins if the site has fewer than 5 topics. 2014-05-23 12:25:16 -04:00
Jeff Atwood
f0dafb4132 unused category-column css -- doesn't exist 2014-05-23 01:51:52 -07:00
Jeff Atwood
13e18cb038 misaligned curlies 2014-05-23 01:42:53 -07:00
Jeff Atwood
0d2fffe180 remove size-based max-width from main-link 2014-05-23 01:37:20 -07:00
Jeff Atwood
52280170d5 a bit more room for reply-to-tab 2014-05-23 01:29:23 -07:00
Jeff Atwood
2eca37b7ae wider share-link dialog to better show URL 2014-05-23 00:46:45 -07:00
Jeff Atwood
132f04a0be Merge pull request #2380 from awesomerobot/master
adding some padding to the topic-body
2014-05-23 00:11:53 -07:00
Kris Aubuchon
3cd91b50ed adding some padding to the topic-body, helps selection is Firefox and makes highlighted posts look better 2014-05-23 02:40:55 -04:00
Jeff Atwood
61d17e961e unnecessary rule caused extra spacing in Firefox 2014-05-22 21:47:24 -07:00
Jeff Atwood
2531e4e3a1 old legacy css rule, not needed 2014-05-22 21:29:42 -07:00
Sam
2350227a6f Merge pull request #2379 from awesomerobot/master
topic list highlight fix, some quote style fixes
2014-05-23 12:36:26 +10:00
Kris Aubuchon
00278b42d8 topic list highlight fix, some quote style fixes 2014-05-22 21:55:50 -04:00
Sam
e06da1821d BUGFIX: notifications were not updated correctly live
- missing notifications when multiple replies in topic (till refresh)
- not cleared properly on click
2014-05-23 11:34:34 +10:00
Jeff Atwood
3445661898 Merge pull request #2374 from awesomerobot/master
darkening the too-light-grey and the primary black a bit
2014-05-21 18:50:36 -07:00
Kris Aubuchon
e439df4b6b darkening the too-light-grey and the primary black a bit 2014-05-21 21:18:25 -04:00
Neil Lalonde
742841ddce Add Google Oauth2 authenticator. The current Google OpenID authentication has been deprecated by Google and will NOT work for any new websites. 2014-05-21 18:35:10 -04:00
Neil Lalonde
7061f6a570 FIX: displayErrors is undefined in flags.js controller 2014-05-21 12:19:27 -04:00
Robin Ward
00fefb8e45 If both GA endpoints are provided, don't use both. 2014-05-21 07:36:58 -04:00
Robin Ward
3f6bf2fda0 FIX: Home key was broken due to some HTML changes 2014-05-21 07:30:47 -04:00
Vikhyat Korrapati
d208e4d517 Multiple grant badges. 2014-05-21 12:54:55 +05:30
Sam
1714bfe441 SECURITY: fix XSS when expanding quotes 2014-05-21 15:03:31 +10: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
8a24a34b1b ES6: More controllers 2014-05-20 12:49:38 -04:00
riking
96f97d9d4c Consider URLs starting with # as internal 2014-05-20 00:54:22 -07:00
Jeff Atwood
32000228e6 correct error in CSS 2014-05-19 22:27:33 -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
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
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
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
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
Sam
9e3c08b5ee Merge pull request #2354 from vikhyat/badge-system
Badge system updates
2014-05-18 20:03:20 +10: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
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
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
99f9140147 add glyph to "must be signed in" sign in btn 2014-05-16 14:57:30 -07: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
Kris Aubuchon
1fd6a9067b making onebox styles consistent with quotes 2014-05-16 10:19:02 -04:00
Erick Guan
60b9c8b79e align for user dropdown. No badge for zero incoming message. 2014-05-16 19:54:58 +08:00
Vikhyat Korrapati
215e42053a FIX: missing badge descriptions. 2014-05-16 13:39:40 +05:30
Sam
109d7cc52d move into property so does not evaluate too early. 2014-05-16 12:06:51 +10:00
Sam
d897eada61 Improve visual styling for badges page 2014-05-16 11:08:06 +10:00