10231 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Kris Aubuchon	78f9c83604	using max-width on the #main-logo versus setting a static width	2013-11-08 11:29:39 -05:00
Wojciech Zawistowski	e3e2d66ae4	FIX: adds fixture test helper to JSHint config	2013-11-08 17:28:57 +01:00
Dmitry Ustalov	548806d050	Actualize ru.js.categories	2013-11-08 21:20:12 +05:00
Neil Lalonde	630ef0f322	Should be able to see edits to your own posts	2013-11-08 10:18:41 -05:00
Régis Hanol	98a91b80aa	Merge pull request #1628 from vipulnsward/server_typos-1 ... Fix more typos in server locale	2013-11-08 06:25:55 -08:00
Vipul A M	355459b8c7	Fix more typos in server locale	2013-11-08 18:45:11 +05:30
Régis Hanol	b95e74b237	Merge pull request #1627 from awesomerobot/master ... adding highlight & fade back in for direct links to posts	2013-11-08 00:51:13 -08:00
Kris Aubuchon	40aa62f613	adding highlight & fade to linked topic	2013-11-07 23:12:18 -05:00
Neil Lalonde	15c29fdbed	Version bump to v0.9.7.3	2013-11-07 17:29:01 -05:00
Robin Ward	c753a3c784	We shouldn't be matching on the created_at field. Causes tests to randomly fail.	2013-11-07 16:35:40 -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
Robin Ward	35d4229847	Merge pull request #1624 from velesin/qunit_fixture_helpers ... adds QUnit test helper simplifying usage of #qunit-fixture	2013-11-07 12:34:42 -08:00
Robin Ward	43c577adf5	Merge pull request #1623 from velesin/remove_qunit_scratch ... removes redundant #qunit-scratch (use standard #qunit-fixture instead)	2013-11-07 12:33:58 -08:00
Robin Ward	0a692d00da	Merge pull request #1615 from velesin/header_notifications_tests ... adds integration tests for notifications dropdown in header	2013-11-07 12:33:38 -08:00
Robin Ward	6e43372e7c	Merge pull request #1610 from salbertson/sa-refactor-users-update ... Move logic for updating a user to a service class	2013-11-07 12:29:19 -08:00
Neil Lalonde	0c6f794eb0	Used the term suspended instead of banned.	2013-11-07 13:53:49 -05:00
Wojciech Zawistowski	89d33c5f3f	adds QUnit test helper simplifying usage of #qunit-fixture	2013-11-07 19:46:38 +01:00
Régis Hanol	706f96af0a	rake task to install/update plugins (props to @marcoceppi)	2013-11-07 18:48:23 +01:00
Wojciech Zawistowski	74cbb18f67	removes redundant #qunit-scratch (replaces it with standard #qunit-fixture)	2013-11-07 18:18:07 +01:00
Scott Albertson	72bfa4471f	Move logic for updating a user into a service class	2013-11-07 08:39:39 -08:00
Régis Hanol	005163b17b	Merge pull request #1621 from ofgeek/patch-1 ... Update client.zh_CN.yml	2013-11-07 00:20:15 -08:00
ofGEEK	af0d712253	Update client.zh_CN.yml	2013-11-07 09:08:21 +08:00
Robin Ward	01b768392a	Remove default_scope	2013-11-06 16:56:49 -05:00
Robin Ward	006e72ff5a	Fix migration that does not contain position	2013-11-06 16:18:41 -05:00
Robin Ward	902b6bc79f	FIX: Oneboxes were losing formatting in preview after being cached.	2013-11-06 15:58:41 -05:00
Neil Lalonde	ad850f7349	Downgrade Sidekiq to 2.15.1 because our sidekiq workers are dying	2013-11-06 15:58:14 -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	948a545cb1	Category descriptions should not appear in digests	2013-11-06 15:05:06 -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
Régis Hanol	8d47215ea5	Fixed Youtube videos appearing on top of compose panel (props to @hrobertson)	2013-11-06 17:19:02 +01:00
Régis Hanol	4863c4517a	use absolute url for assets too	2013-11-06 16:59:11 +01:00
Sam	e5202b19c0	fix for emoji precompile	2013-11-06 22:39:28 +11:00
Régis Hanol	86a60113a6	fix avatars:regenerate rake task	2013-11-06 12:32:27 +01:00
Régis Hanol	1dcbe9c1c0	update fog gem	2013-11-06 12:16:30 +01:00
Régis Hanol	f8e2ecfa94	keep track of the user who revised a post	2013-11-06 11:43:40 +01:00
Régis Hanol	3992aa971d	ninja_edit_window is is seconds, not minutes	2013-11-06 11:08:57 +01:00
Régis Hanol	eebaf509e2	Merge pull request #1619 from ofgeek/patch-1 ... Update client.zh_CN.yml	2013-11-06 00:02:08 -08:00
ofGEEK	58f3949f7f	Update client.zh_CN.yml	2013-11-06 10:21:15 +08:00
Sam	6acc31c837	move dbs into git ignored area	2013-11-06 11:44:29 +11:00
Sam	0327f6e02a	fix Rails 4 multisite so connection handlers don't keep spinning up new pools	2013-11-06 11:44:29 +11:00
Sam	dee38dad9d	we don't need this backport	2013-11-06 11:44:29 +11: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
Sam	11260b4af4	Merge pull request #1618 from railsaholic/rails4_spec_deprecation_warning_fix ... Relation#all deprecation warning fix for Rails 4	2013-11-05 14:40:10 -08:00
Neil Lalonde	8838b555cd	The entire notification when there are new topics is clickable	2013-11-05 16:56:32 -05:00
Neil Lalonde	adba0c2996	Avoid deprecation warning about whitelist_attributes in rails 4	2013-11-05 15:47:43 -05:00
Neil Lalonde	18bc6ecd08	Sidetiq::Clock#start is deprecated. Remove it.	2013-11-05 15:43:48 -05:00
Neil Lalonde	2342da893d	Fix [object object] being rendered where it should be an ip address	2013-11-05 15:00:54 -05:00