6646 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Ward	b8448b6e39	Merge pull request #1982 from velesin/posts_controller_replies_tests ... Adds tests for PostsController#replies.	2014-02-20 13:36:31 -05:00
Régis Hanol	918af0c6ee	BUGFIX: make sure we can access db config hash with either strings or symbols	2014-02-20 19:11:43 +01:00
Régis Hanol	1f90f3044f	BUGFIX: restore wasn't working when not using multisite in production	2014-02-20 18:42:17 +01:00
Neil Lalonde	b696c96a19	Look at the age of a user's first post to determine if the user can be nuked, instead of looking at when the user registered.	2014-02-20 12:29:40 -05:00
Wojciech Zawistowski	cfbeba84d2	Adds tests for PostsController#replies.	2014-02-20 17:38:13 +01:00
Robin Ward	a57ecef253	BUGFIX: Do not allow font tags.	2014-02-20 11:10:56 -05:00
Régis Hanol	bc5168c3c7	BUGFIX: rename site_settings in the database too	2014-02-20 17:08:26 +01:00
Régis Hanol	3e7ae1c0f4	Merge pull request #1981 from vikhyat/spoilers ... Preserve spoiler tags in post excerpts	2014-02-20 12:31:52 +01:00
Vikhyat Korrapati	e781a758ad	Preserve spoiler tags in post excerpts.	2014-02-20 15:01:44 +05:30
Régis Hanol	0fefdb3ed9	Merge pull request #1980 from Onaldanm/patch-fr-bulk ... Add topics.bulk french translation	2014-02-20 10:15:30 +01:00
Onaldanm	7d1a39de84	Add topics.bulk french translation ... First proposition, I hope doing it correctly :) Fix extra space	2014-02-20 03:31:56 -05:00
Neil Lalonde	ac8203b601	FIX: plugin translations overwrite each other	2014-02-19 17:16:36 -05:00
Robin Ward	2d398903c0	Allow jump to top on post 2 or 3.	2014-02-19 14:23:43 -05:00
Robin Ward	0c45cf1ee7	FIX: Allow closing the category dropdown when clicking on the same ... category	2014-02-19 14:17:38 -05:00
Robin Ward	634b769cda	Merge pull request #1903 from vikhyat/poll-plugin ... Add poll plugin	2014-02-19 13:15:43 -05:00
Robin Ward	40585637fe	Merge pull request #1948 from riking/patch-3 ... Removing more stuff from the sanitizer whitelist	2014-02-19 12:30:56 -05:00
Robin Ward	d56b1b1c74	Merge pull request #1975 from orend/simplify_topic_posters_summary ... simplify TopicPostersSummary	2014-02-19 12:30:10 -05:00
Régis Hanol	d443ddd43d	Merge pull request #1922 from joallard/language-toggle ... Allow users to toggle interface language in their preferences	2014-02-19 18:28:00 +01:00
Robin Ward	ef18e415cf	Merge pull request #1978 from velesin/posts_controller__by_number_tests ... Adds specs for PostsController#by_number.	2014-02-19 12:26:57 -05:00
Régis Hanol	a682c8fc91	BUGFIX: do not push read-only signal to ALL sites	2014-02-19 18:21:41 +01:00
Wojciech Zawistowski	5e8db5ce14	Adds specs for PostsController#by_number.	2014-02-19 17:41:17 +01:00
Régis Hanol	c8795d8aa4	fix typo	2014-02-19 17:21:47 +01:00
Régis Hanol	d5a3b4deee	BUGFIX: missed a spot in the backup rake task	2014-02-19 17:09:43 +01:00
Régis Hanol	27f3aa6bdc	BUGFIX: actually use db_conf everywhere	2014-02-19 15:43:59 +01:00
Régis Hanol	438f97d8b0	BUGFIX: backup/restore rake tasks weren't working	2014-02-19 15:25:31 +01:00
Oren Dobzinski	d0fbabeb0b	simplify TopicPostersSummary	2014-02-18 23:53:30 -05:00
Kane York	9f8f0f115c	Restore 'article' to whitelist	2014-02-18 16:22:42 -08:00
Neil Lalonde	7f6b2e5563	Show login button on 404 page. Add routes to show login and signup modals when page/route loads. If logged in and showing 404 page, load ember app.	2014-02-18 17:18:53 -05:00
Sam	2a8734f0d5	Suppress search in topic unless we have more than 10 posts ... (configurable in site setting)	2014-02-19 08:59:18 +11:00
Robin Ward	18e98851e3	Use lower case group names in URLs	2014-02-18 16:43:19 -05:00
Sam	43612e9fde	Merge pull request #1971 from velesin/posts_controller_refactoring ... Refactors PostsController and adds unit tests.	2014-02-19 08:34:40 +11:00
Sam	3eec3136d5	Merge pull request #1972 from verg/user_pref_save_btn ... Add Save button to top of user preferences	2014-02-19 08:30:17 +11:00
Robin Ward	f19b0b5fe0	Include members count on groups page.	2014-02-18 16:17:04 -05:00
Robin Ward	535c6b272f	FIX: Update onebox gem to bring back wordpress oneboxing	2014-02-18 16:04:40 -05:00
Neil Lalonde	997a7c676e	If flagging a topic with only one post, flag the post instead	2014-02-18 15:18:31 -05:00
Jonathan Allard	0592420e52	Add a site setting to allow users to toggle I18n.locale ... It is false by default.	2014-02-18 14:54:00 -05:00
Jonathan Allard	c513725f26	Allow users to toggle interface language in their preferences	2014-02-18 14:53:59 -05:00
Robin Ward	1a8ebb710e	Rollback faraday gem to fix conflicts	2014-02-18 13:50:00 -05:00
Robin Ward	3f3c07f136	FEATURE: Can bulk update the notification level of topics	2014-02-18 13:02:22 -05:00
Neil Lalonde	d0ecccb7e4	Translate asterisks in ip addresses to mask format so people can enter things like 127.*.*.* in screened ip addresses form	2014-02-18 13:00:55 -05:00
verg	d087783fe8	Add Save button to top of user preferences	2014-02-18 12:51:37 -05:00
Régis Hanol	69e0342d8f	fix typo	2014-02-18 18:24:11 +01:00
Régis Hanol	74f1db11e9	remove useless binding	2014-02-18 18:23:28 +01:00
Régis Hanol	30ccdf3fb7	BUGFIX: calling _super() won't actually set the model to the controller ... cf. 351719f7c1 (commitcomment-5410366) for more information	2014-02-18 18:21:35 +01:00
Wojciech Zawistowski	5b9a4d3581	Refactors PostsController and adds unit tests.	2014-02-18 17:19:38 +01:00
Neil Lalonde	6c23a1903e	FIX: show ip address with mask again on /admin/logs/screened_ip_addresses	2014-02-18 10:33:08 -05:00
Sam	38004fc218	hold back image optim due to svg issue	2014-02-18 20:30:54 +11:00
Sam	884346cbea	Merge pull request #1951 from thoughtbot/bb-erb ... Use ERB to pull conf files into app	2014-02-18 16:23:55 +11:00
Sam	887e835a9b	Merge pull request #1969 from riking/scroll-position ... Put requested post in middle of page	2014-02-18 16:17:26 +11:00
Sam	983c7567aa	BUGFIX: seen recently key needs to be public so mock can easily reach in to it	2014-02-18 16:09:24 +11:00