Commit Graph

3124 Commits

Author SHA1 Message Date
Robin Ward 6853f37bee Show estimated reading time near summarize button. 2013-12-10 13:47:36 -05:00
Neil Lalonde 561961eff6 FIX: can grant titles to regular users. Guardian initializer needs current_user, not the target user. 2013-12-10 12:46:35 -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
Neil Lalonde e3660e59b4 Strip http(s) from SiteSetting.ga_domain_name 2013-12-06 11:46:52 -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 418856a789 make sure assets always use schemaless absolute uris 2013-12-06 11:16:13 +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
Scott Albertson 51eff92170 Refactor UsersController#create
* Simplify controller action
* Extract service classes
2013-12-05 10:11:16 -08: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
Sam 2db3cfb16b annotate models 2013-12-05 17:40:35 +11: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 2d928a0537 local merge
Merge remote-tracking branch 'upstream/master'
2013-12-04 10:39:39 -05:00
Kris Aubuchon 15516f34c7 fixing the user column on the topic-list page 2013-12-04 10:38:01 -05:00
Neil Lalonde abed146cc7 FIX: Category description topics shouldn't auto-close 2013-12-04 10:31:25 -05:00
Robin Ward df7b24b14a Merge pull request #1716 from ok-harry/master
set_locale of application_controller.rb must be called earlier
2013-12-04 07:09:14 -08:00
Vikhyat Korrapati 243acb4f05 Auto close topic on form submit rather than button click. 2013-12-04 18:17:28 +05:30
Harry Seo 2d9876a6ac FIX: set_locale filter must be executed before check_xhr filter because check_xhr filter renders html in some cases 2013-12-04 20:49:54 +09:00
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
Robin Ward 8b4c030c16 Small email fixes 2013-12-03 10:11:04 -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
Neil Lalonde 7bbb32bac2 Fix javascript_include_tag for browser-update so it includes MD5. Needed to add .js extension for some reason. 2013-12-02 15:57:23 -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
MK 2d4e62dd64 Fixed broken links in Digest email
Based on @eviltrout's fix from 7a60eacca9.
2013-12-02 01:11:55 -05:00
Sam 7f4697a200 bug: if status changes always attempt to update the feature topics for the category right away 2013-12-02 16:32:24 +11:00
Sam a2d5a7dbd8 auto close is messed up in category edit, remove for now 2013-12-02 16:13:32 +11:00
Sam 8d859a9f68 break cache of fonts 2013-12-02 08:19:34 +11:00
Benjamin Brent 761da7d380 Fix email_preview AJAX call to use Discourse.ajax 2013-12-01 13:30:41 +11:00
Sam f5d905c215 Merge pull request #1707 from chancancode/as_json_fix
The Rails JSON encoder API requires `as_json` to take an optional arg
2013-11-30 03:40:21 -08:00
Godfrey Chan 6bbea9de0b The Rails JSON encoder API requires `as_json` to take an optional arg 2013-11-29 21:43:44 -08:00
Kris Aubuchon a9060fac70 added KBD style back 2013-11-29 22:44:00 -05:00
Robin Ward 7a60eacca9 FIX: Broken unsubscribe link in HTML email 2013-11-29 17:13:16 -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
Robin Ward 781a8876d3 Show post count in digest emails. Sort by score 2013-11-29 13:00:25 -05:00
Robin Ward 3da2285ef1 FIX: Missing styles in HTML digest emails 2013-11-29 12:21:36 -05:00
Régis Hanol 9b6538832d whitelist google.com/maps iframes 2013-11-29 18:08:53 +01:00
Robin Ward 8c8645f158 FIX: Code and Emoticon formatting in HTML emails. 2013-11-28 17:21:14 -05:00
Neil Lalonde 4ec0543362 FIX: emails with embedded posts should always use absolute URLs 2013-11-28 15:57:21 -05: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
Sam 79087f4e6f fix exception in logs 2013-11-28 12:39:59 +11:00
Régis Hanol 52160179f8 add a tombstone for extra safety 2013-11-27 22:05:11 +01: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
Neil Lalonde 746e115f99 Fix path of browser-update 2013-11-27 13:56:22 -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
jjangg96 c2e7e72b74 faq.ko.html.erb Added
Korean translate updated.
2013-11-27 12:21:59 +09:00
Sam d6a14889ac Merge branch 'master' of github.com:discourse/discourse 2013-11-26 10:21:57 +11:00
Sam 3fa48f8d76 Style fix: https://twitter.com/andrzejkrzywda/status/404943844896423937 2013-11-26 10:21:41 +11:00
Régis Hanol b0d132ee2e make sure image urls have a scheme before pulling them in 2013-11-25 19:47:53 +01: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