3093 Commits

Author	SHA1	Message	Date
Sam	96fdf72d5e	rails master compatability	2013-12-13 17:04:45 +11:00
Sam	8ccab6d140	Got rid of buggy yepnope spaghetti, however mobile detection really should be driven from the server.	2013-12-13 15:17:05 +11:00
Régis Hanol	6641230b7f	Merge pull request #1733 from voisintotoro/newmaster2 ... Updated French translation and fixed the fr_FR: to fr:	2013-12-12 15:02:05 -08:00
Neil Lalonde	eadf5e9b02	Move columns around on wide categories page	2013-12-12 17:27:25 -05:00
voisintotoro	cb7de5d2de	Updated French translation and fixed the fr_FR: to fr:	2013-12-12 23:17:43 +01:00
Neil Lalonde	50bd05663c	Fix category ordering on categories page. I broke it.	2013-12-12 17:13:35 -05:00
Neil Lalonde	ee5637d4ff	FIX: font-awesome issue on site settings buttons	2013-12-12 16:09:44 -05:00
Neil Lalonde	9f9852a8dd	FIX: broken font-awesome icons on user activity pages	2013-12-12 16:07:34 -05:00
Neil Lalonde	52cf27b0a6	FIX: layout problems on categories page	2013-12-12 15:52:36 -05:00
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
Sam	50c4e3707b	Merge pull request #1731 from chancancode/no_more_scoped_in_rails_4_1 ... ✂️ scoped for Rails 4 compat	2013-12-12 12:38:57 -08:00
Régis Hanol	cf44b9e9d9	add image dimensions & size in lightbox	2013-12-12 17:39:20 +01:00
Régis Hanol	c7741c9622	FIX: absolute canonical link on topic pages	2013-12-12 17:24:00 +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	1457a3792d	that fix should have been in the emoji plugin	2013-12-12 16:42:27 +01:00
Régis Hanol	be835785f8	FIX: allow new user to post emojis	2013-12-12 15:05:18 +01:00
Godfrey Chan	3c80ee0b8a	✂️ scoped for Rails 4 compat	2013-12-12 00:37:04 -08: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
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