Commit Graph

5252 Commits

Author SHA1 Message Date
Neil Lalonde 791f5ac94e Load site settings from config/site_settings.yml 2013-11-14 16:02:13 -05:00
Robin Ward 968c0672ef Enable column sorting main topic list 2013-11-14 15:50:36 -05:00
Robin Ward 67041d1c6d Support for tracking the count of unique participants in a topic 2013-11-14 14:32:41 -05:00
Scott Carleton 32e414690a Handle ugly url targets 2013-11-14 13:14:02 -05:00
Robin Ward 41dfcd2774 FIX: Pagination while sorting on column headers 2013-11-14 12:35:18 -05:00
Régis Hanol 07cbf8f4e3 do not customize the admin section 2013-11-14 16:41:16 +01:00
Sam 23deecfe44 Merge pull request #1651 from awesomerobot/master
New onebox styles, and a few small fixes
2013-11-13 22:49:54 -08:00
Sam e57ddcf276 remove discourse dependency from message bus 2013-11-14 16:37:50 +11:00
Kris Aubuchon 5bf2b40dbc quick fix 2013-11-13 23:19:37 -05:00
Kris Aubuchon 829346468c new onebox style (similar to blockquotes), spacing for auto-close message, making link badge easier to read 2013-11-13 23:10:47 -05:00
Sam ee280c5c04 correct param expansion 2013-11-14 12:54:52 +11:00
Robin Ward d30721f06b Remove "sorting" color 2013-11-13 16:39:49 -05:00
Robin Ward 9cbfd8362d FIX: Warnings in Qunit suite 2013-11-13 14:26:29 -05:00
Robin Ward bda5a72c6a Server side support for custom ordering of topics 2013-11-13 14:17:06 -05:00
Robin Ward 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
Robin Ward df568df9dc Controls for sorting topic columns 2013-11-13 11:48:38 -05:00
Régis Hanol 7e7d951152 do not pull hotlinked images when max_image_size_kb == 0 2013-11-13 17:30:48 +01:00
Régis Hanol a01b423263 remove empty plugin.rb file 2013-11-13 16:14:22 +01:00
Jeff Atwood c23c8a7e3a we forgot word-wrap: break word on post body 2013-11-13 01:28:36 -08:00
Régis Hanol 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
Régis Hanol 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
Régis Hanol 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
Sam 8339337cd1 strip out docker stuff, put into a plugin 2013-11-13 17:42:31 +11:00
Sam 2610bd0192 vendor/bundle can be ignored 2013-11-13 16:20:49 +11:00
Sam 0e8914cee6 add unicorn launcher to support live reloads
add oobgc rudimentary support
2013-11-13 15:29:36 +11:00
Wojciech Zawistowski e41774a0ea fixes Ember's deprecation errors in NotificationsController unit tests 2013-11-12 21:52:07 +01:00
Wojciech Zawistowski a957a23b66 fixes missing imege url errors in logo component tests 2013-11-12 21:21:02 +01:00
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