9cbfd8362d
FIX: Warnings in Qunit suite
2013-11-13 14:26:29 -05:00
bda5a72c6a
Server side support for custom ordering of topics
2013-11-13 14:17:06 -05:00
7207cef7aa
TopicQuery cleanup in advance of custom sorting:
...
- Move SQL method constants into a module
- Removed unused count methods
- Moved methods that don't return a TopicList into Topic
- Replaced some confusing method signatures
2013-11-13 12:26:32 -05:00
df568df9dc
Controls for sorting topic columns
2013-11-13 11:48:38 -05:00
7e7d951152
do not pull hotlinked images when max_image_size_kb == 0
2013-11-13 17:30:48 +01:00
a01b423263
remove empty plugin.rb file
2013-11-13 16:14:22 +01:00
c23c8a7e3a
we forgot word-wrap: break word on post body
2013-11-13 01:28:36 -08:00
9165769da2
Merge pull request #1647 from velesin/notifications_controller_test_fix
...
fixes Ember's deprecation errors in NotificationsController unit tests
2013-11-13 00:27:27 -08:00
758a31e524
Merge pull request #1646 from velesin/logo_component_test_fix
...
fixes missing imege url errors in logo component tests
2013-11-13 00:27:06 -08:00
2f2d47d250
Merge pull request #1645 from velesin/header_controller_test_fix
...
fixes the problem with perceived not mocked xhr call in tests
2013-11-13 00:26:58 -08:00
8339337cd1
strip out docker stuff, put into a plugin
2013-11-13 17:42:31 +11:00
2610bd0192
vendor/bundle can be ignored
2013-11-13 16:20:49 +11:00
0e8914cee6
add unicorn launcher to support live reloads
...
add oobgc rudimentary support
2013-11-13 15:29:36 +11:00
e41774a0ea
fixes Ember's deprecation errors in NotificationsController unit tests
2013-11-12 21:52:07 +01:00
a957a23b66
fixes missing imege url errors in logo component tests
2013-11-12 21:21:02 +01:00
a2dd197256
fixes the problem with perceived not mocked xhr call in tests
2013-11-12 20:40:46 +01:00
e9f9d22482
add query parameter to temporarily disable customization
2013-11-12 18:14:22 +01:00
e25cf580d6
You miss one little return statement and @nlalonde crashes the composer :)
2013-11-12 11:48:30 -05:00
a1a89d01c4
JSHint
2013-11-12 11:25:27 -05:00
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
32a3da86da
Merge pull request #1640 from salbertson/sa-refactor-users-controller-invites
...
Refactor UsersController#invited
2013-11-12 08:18:52 -08:00
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
2711a9eef0
Merge pull request #1644 from demil/patch-1
...
Update discourse.js
2013-11-12 08:16:42 -08:00
aeacfb2acc
widened the edit title/category
2013-11-12 14:36:00 +01:00
11428ef9d6
filter out android from mini profiler
2013-11-12 16:47:01 +11:00
932c2675a7
work in progress, admin page for upgrades (provides source lives in git)
2013-11-12 16:42:35 +11:00
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
77b59b54ce
Refactor UsersController#invited
...
* Add test coverage
* Simplify controller action
* Move finder code to Invite class
2013-11-11 13:23:49 -08:00
53f2d4b66c
Updated styles on admin customize page.
2013-11-11 15:20:58 -06:00
3359813624
cleans up header notifications integration tests
2013-11-11 21:51:49 +01:00
e5fd2946e0
Some topic list re-organization.
2013-11-11 15:07:08 -05:00
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
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
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
7fff446317
Merge pull request #1641 from toolness/patch-1
...
Minor typo fix in INSTALL-ubuntu.md.
2013-11-11 09:07:53 -08:00
ea3749e97e
Minor typo fix in INSTALL-ubuntu.md.
2013-11-11 12:07:21 -05:00
1d8a3e6fc8
Add an order for user_stats table in exporter
2013-11-11 10:49:27 -05:00
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
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
3473734af0
FIX: bust broken password
2013-11-11 22:28:26 +11:00
817423db84
very bad idea to remove glyphs from privat / deleted and read restricted topics
2013-11-11 17:11:16 +11:00
0ceeeedf80
correct logic for tracking incoming links
2013-11-11 10:53:01 +11:00
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
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
e27f944ed1
refactors context binding from _this to self
2013-11-10 21:33:16 +01:00
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
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
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
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
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
