Commit Graph

5229 Commits

Author SHA1 Message Date
Neil Lalonde e01ce546e8 When you click Quote Reply, and then cancel the reply, don't ask if you're sure. 2013-11-15 13:13:58 -05:00
Régis Hanol 01523554f3 Merge pull request #1657 from railsaholic/refactor_session_controller
Refactor SessionController#create, reduce complexity.
2013-11-15 09:32:39 -08:00
railsaholic 34bba737ff Refactor SessionController#create, reduce complexity.
Don't compromise readablity
2013-11-15 22:09:03 +05:30
Régis Hanol 8a83f1a88f add disk space usage failsafe 2013-11-15 16:48:38 +01:00
Robin Ward e03ae73c5d Merge pull request #1653 from ScotterC/uri-addressable
URI adapter should use Addressable
2013-11-15 07:24:57 -08:00
Régis Hanol 16267e4887 add download_remote_images_to_local site setting 2013-11-15 15:22:18 +01:00
Régis Hanol 6a3000ffef Merge pull request #1655 from awesomerobot/master
embedded response width fix
2013-11-15 00:52:51 -08:00
Sam 2984d649f5 remove log 2013-11-15 18:22:02 +11:00
Sam 8a868bad58 time saving log 2013-11-15 18:21:19 +11:00
Sam ce6b0ff22e remove puts 2013-11-15 17:54:29 +11:00
Sam c1d7bbdc79 more diags 2013-11-15 17:26:58 +11:00
Sam a92ada0493 tune down min requests, tune up largest multiplier, tune up history 2013-11-15 17:17:08 +11:00
Sam 466459db51 more diags for a bit 2013-11-15 17:08:38 +11:00
Sam 8513164b85 lets not explode if init is called incorrectly 2013-11-15 17:03:03 +11:00
Sam 3219afd666 fix bug, num request should be zeroed, better logging 2013-11-15 16:56:21 +11:00
Sam 2c1104237c including sass twice is pointless 2013-11-15 14:44:30 +11:00
Kris Aubuchon ad9cb01263 embedded response width fix 2013-11-14 21:44:45 -05:00
Sam 461972844e unicorn out of band GC 2013-11-15 12:15:49 +11:00
Sam c9fd14acc4 Merge pull request #1654 from ScotterC/patch-2
Avoiding double manifest files
2013-11-14 15:23:30 -08:00
Scott Carleton 908ba32d37 Avoiding double manifest files
Capistrano chokes if there's two manifest files. 
http://meta.discourse.org/t/rails-4-non-digest-assets-and-capistrano/10948?u=scotterc
2013-11-14 18:22:44 -05:00
Neil Lalonde 8a7fa6e467 Version bump to v0.9.7.4 2013-11-14 17:30:10 -05:00
Neil Lalonde 726b985ece FIX: a js error when reloading /admin/site_settings/category/:id 2013-11-14 16:50:34 -05:00
Neil Lalonde d9e4eec49f Style the site setting category links. Required and Basic Setup are bigger and all other links are to the right of them. 2013-11-14 16:02:14 -05:00
Neil Lalonde c57232b73d Move some site settings around 2013-11-14 16:02:14 -05:00
Neil Lalonde ca0a8a5970 Move save and resetDefault actions to the adminSiteSettingsCategory controller 2013-11-14 16:02:14 -05:00
Neil Lalonde df213d7b23 Filter on site settings across all categories 2013-11-14 16:02:14 -05:00
Neil Lalonde 1e37abc310 Add site setting category support 2013-11-14 16:02:13 -05:00
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