Commit graph

5317 commits

Author SHA1 Message Date
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
Neil Lalonde
6597738322 Improve how banned fields are rendered on admin user page 2013-11-05 15:00:54 -05:00
Manoj
a1e2706c2f Relation#all deprecation warning fix for Rails 4 2013-11-06 01:05:28 +05:30
Robin Ward
bba5631923 Merge pull request #1614 from velesin/integration_test_helper_improvement
enables passing additional setup / teardown code to integration test helper
2013-11-05 10:39:39 -08:00
Robin Ward
84b0792db8 Merge pull request #1616 from velesin/remove_notifications_view
removes unused view
2013-11-05 10:38:51 -08:00
Régis Hanol
37fd7ab574 pull hotlinked images 2013-11-05 19:07:29 +01:00
Wojciech Zawistowski
2f2b99f766 removes unused view 2013-11-05 18:10:04 +01:00
Wojciech Zawistowski
52208b4eb7 adds integration tests for notifications dropdown in header 2013-11-05 17:56:13 +01:00
Wojciech Zawistowski
1dcd2d903b enhances integration test helper with the ability to invoke additional setup / teardown code 2013-11-05 17:42:37 +01:00
Neil Lalonde
8724b2e2b6 Add comments about the IPAddr hack 2013-11-05 11:24:13 -05:00
Régis Hanol
e45ab7d4a8 fix rspec reloaders 2013-11-05 14:53:35 +01:00
Régis Hanol
7923d4d170 Merge pull request #1613 from vipulnsward/locale_typos
Fix some locale typos
2013-11-05 03:02:19 -08:00