Wojciech Zawistowski
a2dd197256
fixes the problem with perceived not mocked xhr call in tests
2013-11-12 20:40:46 +01:00
Régis Hanol
e9f9d22482
add query parameter to temporarily disable customization
2013-11-12 18:14:22 +01:00
Robin Ward
e25cf580d6
You miss one little return statement and @nlalonde crashes the composer :)
2013-11-12 11:48:30 -05:00
Robin Ward
a1a89d01c4
JSHint
2013-11-12 11:25:27 -05:00
Robin Ward
7e1f433f27
Merge pull request #1642 from velesin/header_notifications_tests_refactoring
...
cleans up header notifications integration tests
2013-11-12 08:19:24 -08:00
Robin Ward
32a3da86da
Merge pull request #1640 from salbertson/sa-refactor-users-controller-invites
...
Refactor UsersController#invited
2013-11-12 08:18:52 -08:00
Robin Ward
d9008374aa
Merge pull request #1643 from zachwlewis/fix-admin-customize-header
...
Updated styles on admin customize page.
2013-11-12 08:17:10 -08:00
Robin Ward
2711a9eef0
Merge pull request #1644 from demil/patch-1
...
Update discourse.js
2013-11-12 08:16:42 -08:00
Régis Hanol
aeacfb2acc
widened the edit title/category
2013-11-12 14:36:00 +01:00
Sam
11428ef9d6
filter out android from mini profiler
2013-11-12 16:47:01 +11:00
Sam
932c2675a7
work in progress, admin page for upgrades (provides source lives in git)
2013-11-12 16:42:35 +11:00
demil
adcfa4cf9f
Update discourse.js
...
Inserted if (url.indexOf(u) != -1) return url; in getURL function because of bug in subdirectory install on some urls doubles relative url prefix, for example /forum/forum/latest.json. With this fix it works fine.
2013-11-12 02:36:03 +01:00
Scott Albertson
77b59b54ce
Refactor UsersController#invited
...
* Add test coverage
* Simplify controller action
* Move finder code to Invite class
2013-11-11 13:23:49 -08:00
Zachary Lewis
53f2d4b66c
Updated styles on admin customize page.
2013-11-11 15:20:58 -06:00
Wojciech Zawistowski
3359813624
cleans up header notifications integration tests
2013-11-11 21:51:49 +01:00
Robin Ward
e5fd2946e0
Some topic list re-organization.
2013-11-11 15:07:08 -05:00
Neil Lalonde
2f8866add5
Change admin display-row css so that multiple lines can fit in the control column. Don't hard-code a height on the rows.
2013-11-11 15:03:17 -05:00
Régis Hanol
d65cd0f97e
Merge pull request #1637 from railsaholic/refactor_users_upload_avatar_action
...
Refactor Users#upload_avatar method
2013-11-11 09:59:30 -08:00
railsaholic
58f78e9001
Refactor Users#upload_avatar method
...
Moved avatar file upload to ```AvatarUploadService``` class and
```AvatarUploadPolicy```
Address review comments + require missing file in spec
2013-11-11 23:21:14 +05:30
Régis Hanol
7fff446317
Merge pull request #1641 from toolness/patch-1
...
Minor typo fix in INSTALL-ubuntu.md.
2013-11-11 09:07:53 -08:00
Atul Varma
ea3749e97e
Minor typo fix in INSTALL-ubuntu.md.
2013-11-11 12:07:21 -05:00
Neil Lalonde
1d8a3e6fc8
Add an order for user_stats table in exporter
2013-11-11 10:49:27 -05:00
Neil Lalonde
fe660ba52b
FIX: in Rails 4, ActiveRecord::Base.descendants includes ActiveRecord::SchemaMigration for some reason. Exclude it from export.
2013-11-11 10:49:27 -05:00
Robin Ward
428fcb9841
Merge pull request #1638 from velesin/i18n_helper_self_refactoring
...
refactors context binding from _this to self
2013-11-11 07:36:27 -08:00
Sam
3473734af0
FIX: bust broken password
2013-11-11 22:28:26 +11:00
Sam
817423db84
very bad idea to remove glyphs from privat / deleted and read restricted topics
2013-11-11 17:11:16 +11:00
Sam
0ceeeedf80
correct logic for tracking incoming links
2013-11-11 10:53:01 +11:00
Sam
d1d661f6e1
add logic that auto closes any topics that missed the queued job (due to redis flush or whatever)
2013-11-11 10:52:44 +11:00
Sam
a9c5d843f7
remove problem spec that does not work properly in rails 4 mode into application controller and correct it
2013-11-11 10:50:48 +11:00
Wojciech Zawistowski
e27f944ed1
refactors context binding from _this to self
2013-11-10 21:33:16 +01:00
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
