Commit graph

4716 commits

Author SHA1 Message Date
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
Sam
1e28668e9f missed one spot where route changed 2014-05-28 01:09:01 +10:00
Robin Ward
663c57a0f0 ES6: Most controllers converted over now. 2014-05-27 10:51:03 -04:00
Sam
50a0c1a751 BUGFIX: fix redirect, correct multisite 2014-05-28 00:15:09 +10: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
ce6c25afed Correct query so it scopes correctly 2014-05-27 22:17:04 +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
6e0f54ba9a slow down the back fill process a bit 2014-05-27 20:46:17 +10:00
Sam
f733d5532f BUGFIX: broken like expansion 2014-05-27 19:43:19 +10:00
Sam Saffron
4b611f87e9 use bicubic so we support earlier image magicks like the one in docker
TODO upgrade docker base image to latest image magick
2014-05-27 15:38:11 +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 Saffron
9262a714bd BUGFIX: include avatar for system user 2014-05-27 12:38:16 +10:00
Sam
033cbc61bf BUGFIX: broken spec 2014-05-27 10:08:03 +10:00
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
Sam
4ccf07be8c Improve resize logic so images end up sharper 2014-05-27 09:48:13 +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
7900c7bd2f Allow multiple subcategories with the same name 2014-05-26 15:33:51 -04: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
Robin Ward
b1d2aba0f3 Clean up notifications if a user can't see a topic 2014-05-26 13:26:46 -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
Sam
7fbf162666 Logster update
cleans up a bunch of messed up context stuff with multisite
improves backtraces
adds request params
2014-05-25 13:54:52 +10:00
Neil Lalonde
b4c4cc2d13 Merge pull request #2365 from ok-harry/master
korean translation: *.ko.html.erb
2014-05-23 15:54:21 -04: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
Neil Lalonde
8267a451b2 Disallow /users/ in robots.txt 2014-05-23 10:28:26 -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
e34321af7a add sign in user glyph to 404 page 2014-05-23 01:01:09 -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
ff6755f1e5 Merge pull request #2343 from knutaldrin/patch-1
Fix suspended scope
2014-05-23 12:56:32 +10: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
Neil Lalonde
d2c34d17b7 Fix failing spec. Stubbing intermittently does not stub... 2014-05-22 11:06:19 -04: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
867c56d9c7 Add link to google config instructions. Fix dashboard warning for google oauth2. 2014-05-21 19:11:10 -04:00
Sam
7fee3d7f8f Annotate models 2014-05-22 09:00:38 +10: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
Robin Ward
5e07d18069 FIX: Don't track pageView on initial load. Let the router signal that. 2014-05-21 14:04:08 -04:00
Neil Lalonde
7061f6a570 FIX: displayErrors is undefined in flags.js controller 2014-05-21 12:19:27 -04:00
Neil Lalonde
68747c8d2d FIX: category_list_spec would sometimes fail. It was passing only by luck. 2014-05-21 10:37:37 -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
riking
7f0b66246b Tweak the no-js layout 2014-05-20 16:34:18 -07:00
Robin Ward
6dd1880f1f FIX: More safety when displaying link counts on blogs 2014-05-20 15:20:33 -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
8a24a34b1b ES6: More controllers 2014-05-20 12:49:38 -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
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
Harry Seo
2ef2afa06c korean translation: *.ko.html.erb 2014-05-20 14:40:21 +09: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
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
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