Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,523 Commits 189 Branches 500 Tags 853 MiB
Commit Graph

3074 Commits

Author SHA1 Message Date
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
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
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