Commit graph

900 commits

Author SHA1 Message Date
Sam
96fdf72d5e rails master compatability 2013-12-13 17:04:45 +11:00
Neil Lalonde
50bd05663c Fix category ordering on categories page. I broke it. 2013-12-12 17:13:35 -05:00
Neil Lalonde
6fa2e68742 Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show. 2013-12-12 15:52:30 -05:00
Sam
50c4e3707b Merge pull request #1731 from chancancode/no_more_scoped_in_rails_4_1
✂️ scoped for Rails 4 compat
2013-12-12 12:38:57 -08:00
Régis Hanol
1457a3792d that fix should have been in the emoji plugin 2013-12-12 16:42:27 +01:00
Régis Hanol
be835785f8 FIX: allow new user to post emojis 2013-12-12 15:05:18 +01:00
Godfrey Chan
3c80ee0b8a ✂️ scoped for Rails 4 compat 2013-12-12 00:37:04 -08:00
Régis Hanol
06dd7ffe3c better revision history 2013-12-12 03:41:34 +01:00
Neil Lalonde
5171a23a9c Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-11 11:19:22 -05:00
Neil Lalonde
2596f7dec2 Revert "Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations." 2013-12-09 16:28:11 -05:00
Neil Lalonde
ca5d4d5e54 Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-09 13:28:42 -05:00
Neil Lalonde
9a24d2651d Allow category to auto-close topics in X hours instead of days. FIX: the system message that says a topic was automatically closed was only counting in days. 2013-12-06 16:39:35 -05:00
Sam
2db3cfb16b annotate models 2013-12-05 17:40:35 +11:00
Neil Lalonde
abed146cc7 FIX: Category description topics shouldn't auto-close 2013-12-04 10:31:25 -05:00
Sam
7f4697a200 bug: if status changes always attempt to update the feature topics for the category right away 2013-12-02 16:32:24 +11:00
Godfrey Chan
6bbea9de0b The Rails JSON encoder API requires as_json to take an optional arg 2013-11-29 21:43:44 -08:00
Robin Ward
769223014c FIX: Allow link redirects inside oneboxed posts 2013-11-29 14:29:49 -05:00
Neil Lalonde
a9ab98ef9e Auto-close time can be entered in 3 ways, so a topic can close at any time 2013-11-27 09:52:35 -05:00
Sam
6544f39bcc fix topic counts not updating automatically in various spots (top menu / categories page / drop down) 2013-11-25 17:37:51 +11:00
Régis Hanol
82b78ec6ba schemaless avatar urls 2013-11-22 19:18:45 +01:00
Régis Hanol
3cf5a363f7 do not destroy uploads when destroying a user 2013-11-22 18:29:07 +01:00
Régis Hanol
f65cde3cda do not bump posts when rebaking 2013-11-22 01:52:26 +01:00
Erik Ordway
bf390163aa Load plugin settings.
Along the lines for loading the locale files for a plugin we should also load the settings.yml for a plugin.  Updated version 04f3e09 that moves the loading to a function. I do not understand why it was necessary to define the function physically earlier in the file as I thought ruby did two pass but that may only apply to functions and not stray code in the class.
2013-11-19 11:43:01 -08:00
Robin Ward
309904ef8f Revert "Merge pull request #1673 from aperrault/patch-04"
This reverts commit c9ea89bdd3, reversing
changes made to 9ed49888fc.
2013-11-19 14:08:45 -05:00
Autumn Perrault
d9c026bec5 Fixing neglect to determine whether a user has the permission to create a topic on a category (besides being able to create a post) in ListController, TopicList, and TopicListSerializer causing the "Create Topic" button to appear even if a user cannot actually create a topic in that category but can reply to a topic therein. 2013-11-19 05:09:58 -07:00
Neil Lalonde
ae58a7db95 Add a warning on dashboard if enforce_global_nicknames is checked, but access key is blank. 2013-11-18 13:45:10 -05:00
Robin Ward
4ce81e1b01 Rename "Best Of" to "Summary" 2013-11-18 12:48:26 -05:00
Robin Ward
ad3e276b4b Rename TopicSummary -> TopicMap 2013-11-18 12:08:21 -05:00
Régis Hanol
dabdcf59c4 allow for arbitrary HTML at the top/bottom of every pages 2013-11-18 17:13:24 +01:00
Sam
6e1198334c automatic groups should be bootstrapped 2013-11-18 12:53:14 +11:00
Sam
1b19444b44 URGENT FIX: code would fail in Ruby 1.9.3 exception does not exist 2013-11-18 09:32:02 +11:00
Neil Lalonde
dfdc618e9a Use File.join instead of hard-coding slashes 2013-11-15 14:34:03 -05:00
Neil Lalonde
fc180ccd71 Site settings: move category into the opts hash so that it's compatibale with existing plugins 2013-11-15 14:32:33 -05: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
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
67041d1c6d Support for tracking the count of unique participants in a topic 2013-11-14 14:32:41 -05:00
Régis Hanol
07cbf8f4e3 do not customize the admin section 2013-11-14 16:41:16 +01: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
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
e9f9d22482 add query parameter to temporarily disable customization 2013-11-12 18:14:22 +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
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
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
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
0c6f794eb0 Used the term suspended instead of banned. 2013-11-07 13:53:49 -05:00
Robin Ward
01b768392a Remove default_scope 2013-11-06 16:56:49 -05:00
Robin Ward
914b723b97 Category dropdown should be in the position order 2013-11-06 15:50:47 -05:00