Commit graph

2125 commits

Author SHA1 Message Date
Neil Lalonde
6fa2e68742 Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show. 2013-12-12 15:52:30 -05:00
Régis Hanol
cf44b9e9d9 add image dimensions & size in lightbox 2013-12-12 17:39:20 +01:00
Régis Hanol
dd93407789 FIX: images should also be inlined in the cooked view 2013-12-12 16:57:56 +01:00
Régis Hanol
06dd7ffe3c better revision history 2013-12-12 03:41:34 +01:00
Neil Lalonde
5171a23a9c Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-11 11:19:22 -05:00
Neil Lalonde
ed3d3ae1e1 Upgrade font-awesome to version 4 2013-12-11 10:31:09 -05:00
Robin Ward
6853f37bee Show estimated reading time near summarize button. 2013-12-10 13:47:36 -05:00
Robin Ward
b0e6475b07 FIX: Staff should be able to see PMs 2013-12-10 11:30:45 -05:00
Neil Lalonde
2596f7dec2 Revert "Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations." 2013-12-09 16:28:11 -05:00
Robin Ward
ef432902ce Missing percentage. CANADIAN SORRY! 2013-12-09 14:48:32 -05:00
Robin Ward
744add9ece FIX: Post count progress was a little off. Minor fix to hidden posts 2013-12-09 14:28:32 -05:00
Robin Ward
5280e279f7 FIX: Merge conflict; "of" number in progress bar was incorrect. 2013-12-09 13:44:37 -05:00
Neil Lalonde
ca5d4d5e54 Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-09 13:28:42 -05:00
Vikhyat Korrapati
621b2b5972 enable_names site setting implementation. 2013-12-08 19:31:25 +05:30
Robin Ward
f9243a10cc Don't debouce afterRender, debounce the preview refreshing mechanism. 2013-12-06 17:14:18 -05:00
Neil Lalonde
9a24d2651d Allow category to auto-close topics in X hours instead of days. FIX: the system message that says a topic was automatically closed was only counting in days. 2013-12-06 16:39:35 -05:00
Robin Ward
8cc6cd933a Don't allow filtering by user in summary mode and vice versa. It's just confusing. 2013-12-06 13:53:19 -05:00
Robin Ward
b646495798 Remove unused translations 2013-12-06 13:16:04 -05:00
Robin Ward
314a0e3fad Some style changes for omitted posts, also mobile style. 2013-12-06 12:51:00 -05:00
Régis Hanol
e103176400 FIX: actually show the upload avatar modal when allow_uploaded_avatars is true 2013-12-06 12:13:24 +01:00
Régis Hanol
a7eced3a06 Merge pull request #1723 from vikhyat/disable-uploads
Don't show uploading forms if the relevant site settings are disabled
2013-12-06 00:26:50 -08:00
Vikhyat Korrapati
483c9f9826 Don't show the upload avatar modal is allow_uploaded_avatars is false. 2013-12-06 11:31:11 +05:30
Vikhyat Korrapati
2850279c45 Don't show the upload option if max_attachment_size_kb is 0. 2013-12-06 10:29:15 +05:30
Neil Lalonde
082f131b27 Add a site setting for when progress bar should only show post number. Default is 1000. 2013-12-05 17:17:44 -05:00
Robin Ward
79427732b2 Show Gaps in the post stream when filters are active
Conflicts:
	app/assets/javascripts/discourse/templates/topic.js.handlebars
2013-12-05 16:46:59 -05:00
Neil Lalonde
0fe5ecbb24 When there are 2000 or more posts, only show the post number on the progress bar 2013-12-05 15:50:15 -05:00
Régis Hanol
6b618a805a FIX: do not destroy current draft when *NOT* abandoning the current reply 2013-12-05 18:08:33 +01:00
Régis Hanol
50bc23c2be Merge pull request #1718 from awesomerobot/master
fixing the user column on the topic-list page
2013-12-04 12:52:05 -08:00
Robin Ward
2a809d7855 Migrate over slackRatio to vendored helper 2013-12-04 13:26:00 -05:00
Robin Ward
3a2ae97668 Vendor the CloakedView stuff 2013-12-04 13:23:20 -05:00
Neil Lalonde
3a6ba907d9 FIX: enter key in login form works again 2013-12-04 11:45:07 -05:00
Robin Ward
0ece195723 Blacklist <center> 2013-12-04 11:43:20 -05:00
Kris Aubuchon
15516f34c7 fixing the user column on the topic-list page 2013-12-04 10:38:01 -05:00
Vikhyat Korrapati
243acb4f05 Auto close topic on form submit rather than button click. 2013-12-04 18:17:28 +05:30
Neil Lalonde
b622edad7d FIX: edit category modal is too short 2013-12-03 17:24:25 -05:00
Neil Lalonde
3cfd2dd667 FIX: quote text twice overwrites the first quote 2013-12-03 16:39:35 -05:00
Robin Ward
cb9fb2acfa FIX: A post via the message bus wasn't updating highest_post_number properly. 2013-12-03 16:25:51 -05:00
Neil Lalonde
915861a646 FIX: suspended users still appear suspended after their suspension expires 2013-12-03 15:53:30 -05:00
Robin Ward
c4394688de FIX: CSRF token retrieval bug 2013-12-03 15:30:33 -05:00
Robin Ward
50fe117d7c FIX: Load order bug 2013-12-03 15:11:33 -05:00
Robin Ward
274743b877 Refactor: Move initialization code into separate initializers that use the API we
developed for plugins.
2013-12-03 14:22:32 -05:00
Robin Ward
de78ee302a - Extract Browser capabilities from Discourse namespace into a Singleton.
- Change Scrolling slack based on Android / Touch / Desktop
2013-12-03 13:03:19 -05:00
Sam
bf2663346a Merge pull request #1712 from awesomerobot/master
making the category dropdown taller
2013-12-02 21:34:54 -08:00
Sam
e16621077a semicolon for the greater good 2013-12-03 16:09:57 +11:00
Kris Aubuchon
d6ddc70fea making the category dropdown taller 2013-12-02 21:09:16 -05:00
Robin Ward
bdac13b636 FIX: If there are no featured topics in a category, don't fail. 2013-12-02 17:44:57 -05:00
Robin Ward
0c259af374 FIX: Don't give weird progress numbers when there are deleted posts. 2013-12-02 15:09:25 -05:00
Robin Ward
b37fae50e3 OOPS: Commented out the wrong line 2013-12-02 14:28:01 -05:00
Robin Ward
48bfcfadd9 Upgrade Ember.js, fix swallowing of template errors, report unresolved promises in development mode. 2013-12-02 13:15:58 -05:00
Neil Lalonde
79f1055164 Fix autoclose form in category modal 2013-12-02 11:03:35 -05:00
Régis Hanol
3842097698 add lightbox extra-zoom on click 2013-12-02 11:03:47 +01:00
Régis Hanol
bfd2fd8607 update magnific popup to latest (v. 0.9.9) 2013-12-02 10:38:15 +01:00
Sam
ea835b78dc Merge pull request #1710 from benjaminbrent/master
Fix email_preview AJAX call to use Discourse.ajax
2013-12-01 23:51:09 -08:00
Sam
a2d5a7dbd8 auto close is messed up in category edit, remove for now 2013-12-02 16:13:32 +11:00
Benjamin Brent
761da7d380 Fix email_preview AJAX call to use Discourse.ajax 2013-12-01 13:30:41 +11:00
Kris Aubuchon
a9060fac70 added KBD style back 2013-11-29 22:44:00 -05:00
Robin Ward
769223014c FIX: Allow link redirects inside oneboxed posts 2013-11-29 14:29:49 -05:00
Régis Hanol
298b54c0e7 add download link in lightbox 2013-11-29 20:03:39 +01:00
Robin Ward
008151e90d FIX: Too much white space between posts on mobile 2013-11-29 13:06:52 -05:00
Régis Hanol
9b6538832d whitelist google.com/maps iframes 2013-11-29 18:08:53 +01:00
Neil Lalonde
a13c7c26f9 Put that autoclose regexp back. Firefox, take it easy. 2013-11-28 14:49:11 -05:00
Robin Ward
5fd87ae45f Merge pull request #1701 from velesin/sitemap_refactoring
refactors site map
2013-11-28 11:21:36 -08:00
Robin Ward
f1bce7cc42 Uncomment the loading logic :) 2013-11-28 14:18:32 -05:00
Robin Ward
924a88b5c0 Different Slack ratio on Touch devices, show loading indicator 2013-11-28 14:18:13 -05:00
Robin Ward
488e9ca9dd On mobile, keep topic map collapsed by default. Also, when collapsed don't show as many
data turds.
2013-11-28 11:45:16 -05:00
Neil Lalonde
1cc72d564f Add specs for topic create with auto_close_time. Just ignore auto_close_time from users who are not authorized to use it instead of raising an error. 2013-11-28 11:06:04 -05:00
Wojciech Zawistowski
8eef779d38 refactors site map 2013-11-27 21:58:36 +01:00
Robin Ward
09155a9969 FIX: Upward scrolling jumps 2013-11-27 15:58:13 -05:00
Neil Lalonde
13b31e9833 FIX: broke all the things on Firefox 2013-11-27 14:52:29 -05:00
Robin Ward
40f86829f7 Post Cloaking:
* We now use a new custom view, {{cloaked-collection}} to display posts in a topic.

* Posts are removed and inserted (cloaked/uncloaked) into the DOM dynamically based on whether they
  are visible in the current browser viewport.

* There's been a lot of refactoring to ensure the relationship between the post views and the topic
  controller is sane.

* Lots of fixes involving jumping to a post, including a new LockOn component to that tries to stay
  focused on an element even if stuff is loading before it in the DOM that would normally push it
  down.
2013-11-27 12:53:32 -05:00
Neil Lalonde
8a9bef944f Fix browser-update.js so it doesn't depend on jQuery 2013-11-27 12:26:27 -05:00
Neil Lalonde
3442d3adb2 Add left margin to ol and ul 2013-11-27 10:55:54 -05:00
Neil Lalonde
a9ab98ef9e Auto-close time can be entered in 3 ways, so a topic can close at any time 2013-11-27 09:52:35 -05:00
Robin Ward
549060867d Updated documentation for inlineRegexp 2013-11-25 11:35:28 -05:00
Sam
6544f39bcc fix topic counts not updating automatically in various spots (top menu / categories page / drop down) 2013-11-25 17:37:51 +11:00
Sam
92528d7207 message bus update, extract message bus js out into gem 2013-11-25 17:37:01 +11:00
Robin Ward
f1a681aa46 Fix: Participant filter was broken. 2013-11-22 17:02:12 -05:00
Wojciech Zawistowski
afd198a387 removes unused property from HeaderController 2013-11-22 21:07:03 +01:00
Neil Lalonde
4e45c5ff3d Fix js for handling click of header buttons. They were adding /# to the url, which broke routing. 2013-11-22 11:50:57 -05:00
Neil Lalonde
35bb4fc17f When flag is from system, don't show a user avatar. Say System: instead 2013-11-22 11:14:09 -05:00
Wojciech Zawistowski
1d3097245c header sitemap integration tests 2013-11-21 20:38:56 +01:00
Wojciech Zawistowski
b6de8324be FIX: removes invalid, unpaired closing tag 2013-11-21 17:33:03 +01:00
Robin Ward
50005e2ef9 FIX: Back button wasn't reusing scroll position on category filter 2013-11-21 11:31:10 -05:00
Neil Lalonde
97cb9e1545 Signup with 3rd party auth can find the matching username from the Discourse Hub 2013-11-20 14:56:21 -05:00
Robin Ward
ea8e4bfbcf FIX: Double footer navigation 2013-11-20 14:16:33 -05:00
Robin Ward
d09735ff46 Merge pull request #1680 from velesin/user_activity_link_title_fix
FIX: repairs title attr in the link
2013-11-20 09:04:43 -08:00
Robin Ward
fa0b5d3b0e FIX: Missing Private message topic map 2013-11-19 18:59:29 -05:00
Sam
d16298b1d7 Merge pull request #1679 from velesin/logo_improvement
removes redundant enclosing tag
2013-11-19 14:59:45 -08:00
Sam
325ad46c20 Merge pull request #1681 from germanviscuso/japanese_locales
Provides Japanese locales
2013-11-19 14:58:06 -08:00
Neil Lalonde
1616741836 Say something when no site settings match the filter 2013-11-19 16:46:20 -05:00
German Viscuso
3f049f4853 Provides Japanese locales 2013-11-19 22:20:19 +01:00
Wojciech Zawistowski
3a470939f0 FIX: repairs title attr in the link 2013-11-19 21:32:02 +01:00
Wojciech Zawistowski
e7c6abde3e removes redundant enclosing tag 2013-11-19 21:28:05 +01:00
Neil Lalonde
981d8f6aea Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing... 2013-11-19 14:15:28 -05:00
Robin Ward
58b275665b Oops, missing translation 2013-11-19 12:57:54 -05:00
Robin Ward
f5fc0b6b55 Only show external link icons, use the wikipedia-style icon. 2013-11-19 12:42:19 -05:00
Robin Ward
b98456a65f Hide some values from the topic map if they're 0 2013-11-19 12:24:41 -05:00
Robin Ward
20e4a2ef80 Renamed components so they don't all have the annoying discourse- prefix 2013-11-19 11:59:50 -05:00
Sam
3ce6a7be4a defer rendering of the site map
add new and unread links in the site map categories section
2013-11-19 10:41:57 +11:00
Robin Ward
89a96b9e94 FIX: Topic map expansion broken without links. 2013-11-18 17:06:52 -05:00
Robin Ward
9aa2bd068a FIX: Broken links on categories page 2013-11-18 16:59:19 -05:00
Régis Hanol
6e3de67977 fix edit reason when editing a reply 2013-11-18 19:51:30 +01:00
Robin Ward
a2466d182f Added Participants, Likes to Topic Map 2013-11-18 13:49:53 -05:00
Robin Ward
2f39a4ac6d Don't shorten links in Topic Map 2013-11-18 13:49:53 -05:00
Neil Lalonde
ae58a7db95 Add a warning on dashboard if enforce_global_nicknames is checked, but access key is blank. 2013-11-18 13:45:10 -05:00
Neil Lalonde
281f839e54 Site settings page tweak 2013-11-18 13:45:10 -05:00
Robin Ward
629fe8b426 If the topic can be summarized, expand the topic map by default 2013-11-18 13:43:35 -05:00
Robin Ward
4ce81e1b01 Rename "Best Of" to "Summary" 2013-11-18 12:48:26 -05:00
Robin Ward
34e451ef25 Removed extra comma 2013-11-18 12:16:14 -05:00
Robin Ward
f2659a5916 Moved more into components, including summary stuff. 2013-11-18 12:08:21 -05:00
Robin Ward
52048d2d2b Converted Private Message map to a component 2013-11-18 12:08:21 -05:00
Robin Ward
039acd6ead Convert some TopicMap stuff to Ember components 2013-11-18 12:08:21 -05:00
Robin Ward
ad3e276b4b Rename TopicSummary -> TopicMap 2013-11-18 12:08:21 -05:00
Régis Hanol
dabdcf59c4 allow for arbitrary HTML at the top/bottom of every pages 2013-11-18 17:13:24 +01:00
Kris Aubuchon
2e9d0ecac4 adjusting badges a bit 2013-11-17 22:32:58 -05:00
Sam
805feca5f2 message at the bottom for uncategorized was all mangled, fallback to the old way it used to behave 2013-11-18 11:42:40 +11:00
Neil Lalonde
6eb5f1aec2 FIX: site settings page layout at smaller widths 2013-11-16 14:14:49 -05:00
Régis Hanol
482b752046 add edit reason when editing a post 2013-11-15 23:28:49 +01:00
Neil Lalonde
b921478cbb Use debounce to make filtering on the All Results tab faster 2013-11-15 16:46:19 -05:00
Neil Lalonde
d3c84b60c8 Add an All Results tab when filtering the site settings 2013-11-15 16:43:56 -05:00
Neil Lalonde
97bc187735 Use stacked nav on left to navigate site settings categories 2013-11-15 15:22:42 -05:00
Neil Lalonde
e01ce546e8 When you click Quote Reply, and then cancel the reply, don't ask if you're sure. 2013-11-15 13:13:58 -05:00
Régis Hanol
6a3000ffef Merge pull request #1655 from awesomerobot/master
embedded response width fix
2013-11-15 00:52:51 -08:00
Kris Aubuchon
ad9cb01263 embedded response width fix 2013-11-14 21:44:45 -05:00
Neil Lalonde
726b985ece FIX: a js error when reloading /admin/site_settings/category/:id 2013-11-14 16:50:34 -05:00
Neil Lalonde
d9e4eec49f Style the site setting category links. Required and Basic Setup are bigger and all other links are to the right of them. 2013-11-14 16:02:14 -05:00
Neil Lalonde
ca0a8a5970 Move save and resetDefault actions to the adminSiteSettingsCategory controller 2013-11-14 16:02:14 -05:00
Neil Lalonde
df213d7b23 Filter on site settings across all categories 2013-11-14 16:02:14 -05:00
Neil Lalonde
1e37abc310 Add site setting category support 2013-11-14 16:02:13 -05:00
Robin Ward
968c0672ef Enable column sorting main topic list 2013-11-14 15:50:36 -05:00
Robin Ward
41dfcd2774 FIX: Pagination while sorting on column headers 2013-11-14 12:35:18 -05:00
Sam
23deecfe44 Merge pull request #1651 from awesomerobot/master
New onebox styles, and a few small fixes
2013-11-13 22:49:54 -08:00
Sam
e57ddcf276 remove discourse dependency from message bus 2013-11-14 16:37:50 +11:00
Kris Aubuchon
5bf2b40dbc quick fix 2013-11-13 23:19:37 -05:00
Kris Aubuchon
829346468c new onebox style (similar to blockquotes), spacing for auto-close message, making link badge easier to read 2013-11-13 23:10:47 -05:00
Robin Ward
d30721f06b Remove "sorting" color 2013-11-13 16:39:49 -05:00
Robin Ward
9cbfd8362d FIX: Warnings in Qunit suite 2013-11-13 14:26:29 -05:00
Robin Ward
bda5a72c6a Server side support for custom ordering of topics 2013-11-13 14:17:06 -05:00
Robin Ward
df568df9dc Controls for sorting topic columns 2013-11-13 11:48:38 -05:00
Jeff Atwood
c23c8a7e3a we forgot word-wrap: break word on post body 2013-11-13 01:28:36 -08:00
Régis Hanol
e9f9d22482 add query parameter to temporarily disable customization 2013-11-12 18:14:22 +01:00
Robin Ward
a1a89d01c4 JSHint 2013-11-12 11:25:27 -05:00
Robin Ward
d9008374aa Merge pull request #1643 from zachwlewis/fix-admin-customize-header
Updated styles on admin customize page.
2013-11-12 08:17:10 -08:00
Robin Ward
2711a9eef0 Merge pull request #1644 from demil/patch-1
Update discourse.js
2013-11-12 08:16:42 -08:00
Régis Hanol
aeacfb2acc widened the edit title/category 2013-11-12 14:36:00 +01:00
demil
adcfa4cf9f Update discourse.js
Inserted  if (url.indexOf(u) != -1) return url; in getURL function because of bug in subdirectory install on some urls doubles relative url prefix, for example /forum/forum/latest.json. With this fix it works fine.
2013-11-12 02:36:03 +01:00
Zachary Lewis
53f2d4b66c Updated styles on admin customize page. 2013-11-11 15:20:58 -06:00
Robin Ward
e5fd2946e0 Some topic list re-organization. 2013-11-11 15:07:08 -05:00
Neil Lalonde
2f8866add5 Change admin display-row css so that multiple lines can fit in the control column. Don't hard-code a height on the rows. 2013-11-11 15:03:17 -05:00
Robin Ward
428fcb9841 Merge pull request #1638 from velesin/i18n_helper_self_refactoring
refactors context binding from _this to self
2013-11-11 07:36:27 -08:00
Sam
817423db84 very bad idea to remove glyphs from privat / deleted and read restricted topics 2013-11-11 17:11:16 +11:00
Wojciech Zawistowski
e27f944ed1 refactors context binding from _this to self 2013-11-10 21:33:16 +01:00
Wojciech Zawistowski
67a1da7af4 refactors header notifications (renders them via separate controller / template) 2013-11-08 21:06:27 +01:00
Robin Ward
965a0a91a2 FIX: Unloading categories page failed in some circumstances; update to latest Ember. 2013-11-08 14:09:27 -05:00
Régis Hanol
be589da5dc Merge pull request #1630 from awesomerobot/master
using max-width on the #main-logo versus setting a static width
2013-11-08 09:44:06 -08:00
Robin Ward
127c3d0e21 FIX: Performance regression on Markdown renderer. 2013-11-08 11:42:26 -05:00
Kris Aubuchon
78f9c83604 using max-width on the #main-logo versus setting a static width 2013-11-08 11:29:39 -05:00
Neil Lalonde
630ef0f322 Should be able to see edits to your own posts 2013-11-08 10:18:41 -05:00
Kris Aubuchon
40aa62f613 adding highlight & fade to linked topic 2013-11-07 23:12:18 -05:00
Neil Lalonde
dbd2332b74 Public user profile page shows if the user is suspended and why. 2013-11-07 16:34:31 -05:00
Robin Ward
ac9a763ab3 FIX: Extra space before tags in blockquotes 2013-11-07 16:06:50 -05:00
Neil Lalonde
0c6f794eb0 Used the term suspended instead of banned. 2013-11-07 13:53:49 -05:00
Robin Ward
902b6bc79f FIX: Oneboxes were losing formatting in preview after being cached. 2013-11-06 15:58:41 -05:00
Robin Ward
914b723b97 Category dropdown should be in the position order 2013-11-06 15:50:47 -05:00
Robin Ward
3dd4741ce4 FIX: Larger click target for topic progress bar 2013-11-06 15:33:17 -05:00
Robin Ward
de30af9302 Support for inviting to a forum from a user's invite page. 2013-11-06 12:56:50 -05:00
Robin Ward
4a7ef8b460 Adjust margins of ul, ol: they were slightly to the left 2013-11-05 17:57:05 -05:00
Robin Ward
25ef66c60b User invites page now has search, displays first invites_shown records 2013-11-05 17:53:26 -05:00
Neil Lalonde
8838b555cd The entire notification when there are new topics is clickable 2013-11-05 16:56:32 -05:00
Neil Lalonde
6597738322 Improve how banned fields are rendered on admin user page 2013-11-05 15:00:54 -05:00
Robin Ward
84b0792db8 Merge pull request #1616 from velesin/remove_notifications_view
removes unused view
2013-11-05 10:38:51 -08:00
Régis Hanol
37fd7ab574 pull hotlinked images 2013-11-05 19:07:29 +01:00
Wojciech Zawistowski
2f2b99f766 removes unused view 2013-11-05 18:10:04 +01:00
Sam
15996bc52f even on mobile it can be important 2013-11-05 13:44:18 +11:00
Sam
2c1b58c8cc mini profiler is there for a reason :) 2013-11-05 13:43:50 +11:00
Neil Lalonde
bd9b85f076 Screened Urls page shows results for each domain instead of each url 2013-11-04 16:24:48 -05:00
Robin Ward
0b79636b99 Typo! 2013-11-04 15:56:03 -05:00
Robin Ward
ec7298d548 FIX: Regression on topic list for best of links. 2013-11-04 15:48:51 -05:00
Robin Ward
b8e63719f8 FIX: Don't autolink within a markdown link. 2013-11-04 14:24:40 -05:00
Robin Ward
cc47ade2ed missing semi colon 2013-11-04 13:59:31 -05:00
Robin Ward
69503345c4 FIX: Some more non-english category errors 2013-11-04 13:43:33 -05:00
Robin Ward
ee6b97754a Merge pull request #1611 from awesomerobot/master
Category-dropdown items have consistent widths... other fixes
2013-11-04 10:17:21 -08:00
Robin Ward
a13d05660f FIX: Show status icons on user topic pages 2013-11-04 13:13:22 -05:00
Kris Aubuchon
5c3f12f369 merging
Merge remote-tracking branch 'upstream/master'
2013-11-04 12:59:17 -05:00
Neil Lalonde
ede59a4386 FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available. 2013-11-04 12:51:09 -05:00
Kris Aubuchon
1c2b5015a3 fixing user title line-height, adding @mention style back in, consistent category width/alignment 2013-11-04 12:45:18 -05:00
Robin Ward
7360112759 Merge pull request #1600 from GManzato/user_page_flat
Flatter design on User Page
2013-11-04 07:25:57 -08:00
Régis Hanol
b063c4326f Merge pull request #1609 from awesomerobot/master
some general simplification to modal, menus, etc
2013-11-04 06:52:25 -08:00
Kris Aubuchon
70fd4f7f6b merging local with master
Merge remote-tracking branch 'upstream/master'
2013-11-04 09:17:12 -05:00
Kris Aubuchon
4ce711a3b7 some general simplification to modal, menus, etc 2013-11-04 09:16:47 -05:00
Régis Hanol
4f8d0a1a96 revert changes to magnific-popup.scss 2013-11-04 14:44:52 +01:00
Régis Hanol
12ac2f2e99 FIX issues with quote button
Fix the following issues
- Quote button quotes only one word on iOS
- Quote reply popup should not come up when selecting the text in the ‘reply’ button
2013-11-04 12:51:39 +01:00
Régis Hanol
934ede7d91 shorter message for untranslated strings 2013-11-04 11:52:12 +01:00
Robin Ward
7a567d730d Merge pull request #1601 from awesomerobot/master
main logo size consistency fix
2013-11-01 13:32:37 -07:00
Robin Ward
52c3457133 Site setting to support showing real names in posts. Also put back in type to search on site settings 2013-11-01 16:32:12 -04:00
Robin Ward
04aa1690e2 Adjust ul,ol margins 2013-11-01 15:48:28 -04:00
Kris Aubuchon
1f283b5ca9 main logo size consistency fix 2013-11-01 15:45:56 -04:00
Robin Ward
bbf0312e72 FIX: Non-Admins couldn't send private messages through the new user expansion 2013-11-01 15:18:26 -04:00
Neil Lalonde
0060050c08 Replace data-dismiss=modal with action close. It's better to use our own ember code instead of relying on bootbox magic. 2013-11-01 12:14:08 -04:00
Neil Lalonde
92a0729937 When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs. 2013-11-01 10:47:26 -04:00