Commit graph

5145 commits

Author SHA1 Message Date
Régis Hanol
20f06f3efc Merge pull request #1581 from railsaholic/salvage_users_controller_refactoring_from_pr_1499
User ctrl refactor - breaks up large methods, moves some logic into model
2013-11-09 06:24:32 -08:00
sirMackk
af67284995 User ctrl refactor - breaks up large methods, moves some logic into model
Includes missing methods from backup for travis to pass

fix missing code, failing specs

keep params handling in the controller.
2013-11-09 18:44:13 +05:30
Régis Hanol
ed5eb469d5 Merge pull request #1635 from velesin/header_notifications_refactoring
refactors header notifications (renders them via separate controller)
2013-11-09 01:33:40 -08:00
Régis Hanol
345960e194 Merge pull request #1634 from velesin/click_track_tests_fixture_helper
refactors click track tests to use fixture helper
2013-11-09 01:31:41 -08:00
Régis Hanol
b73ae0ddd6 Merge pull request #1633 from velesin/logo_tests_fixture_helper
refactors logo component unit tests to use fixture helper
2013-11-09 01:31:13 -08:00
Wojciech Zawistowski
67a1da7af4 refactors header notifications (renders them via separate controller / template) 2013-11-08 21:06:27 +01:00
Robin Ward
be5de4244c FIX: Pinned posts were not displaying at the top of categories. 2013-11-08 15:05:14 -05:00
Wojciech Zawistowski
e31559b05f refactors click track tests to use fixture helper 2013-11-08 20:30:20 +01:00
Wojciech Zawistowski
db002e9294 refactors logo component unit tests to use fixture helper 2013-11-08 20:23:29 +01:00
Robin Ward
965a0a91a2 FIX: Unloading categories page failed in some circumstances; update to latest Ember. 2013-11-08 14:09:27 -05:00
Robin Ward
bfe3d1ec87 Merge pull request #1629 from dmchk/ru
Actualize ru.js.categories
2013-11-08 09:56:52 -08:00
Robin Ward
cabde46fe4 Merge pull request #1631 from velesin/fixture_jshint_fix
FIX: adds fixture test helper to JSHint config
2013-11-08 09:53:36 -08:00
Robin Ward
326f308da4 Merge pull request #1632 from velesin/header_integration_test_clean_up
cleans up setup of header integration test
2013-11-08 09:53:07 -08:00
Régis Hanol
be589da5dc Merge pull request #1630 from awesomerobot/master
using max-width on the #main-logo versus setting a static width
2013-11-08 09:44:06 -08:00
Robin Ward
921ea603fa Shorten some text 2013-11-08 12:29:35 -05:00
Robin Ward
127c3d0e21 FIX: Performance regression on Markdown renderer. 2013-11-08 11:42:26 -05:00
Wojciech Zawistowski
bdbddddbdd cleans up setup of header integration test 2013-11-08 17:38:35 +01:00
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