24886c300b
Correct few spelling in the comments
2013-12-21 01:19:22 -06:00
2cf2ee9d2d
I need to add better testing here
2013-12-20 17:41:12 +11:00
cc9326c29d
existence in file always overrides
2013-12-20 17:09:51 +11:00
61a50f1cf6
allow nuking of vars via env
2013-12-20 17:07:08 +11:00
13e1016d73
oops forgot to commit this
2013-12-20 16:38:51 +11:00
f5f09933df
Merge branch 'master' of github.com:discourse/discourse
2013-12-20 16:17:52 +11:00
7b8d2547d0
globals now implemented and documented
2013-12-20 16:17:21 +11:00
b312b4d563
clean up config to use global settings
2013-12-20 15:12:23 +11:00
33c6997ded
Move password validation into PasswordValidator
2013-12-19 16:15:47 -05:00
1cac9fa257
New users can only post `newuser_max_replies_per_topic` times per topic.
2013-12-19 13:45:55 -05:00
c35af5d755
FIX: When re-opening a topic that auto-closed, make sure it won't auto-close again
2013-12-19 11:25:05 -05:00
e41eecb91b
Added some missing references, see https://github.com/rails/rails/issues/12982
2013-12-18 15:06:19 -08:00
1f0a59584b
Revert "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-18 14:47:22 -05:00
c0e1ef75f6
Don't auto-close a topic too soon in PeriodicalUpdates
2013-12-18 14:09:49 -05:00
8057373584
Category featured users: show most recent posters instead of most frequent posters
2013-12-18 11:10:03 -05:00
2ef53f89f4
[0] is shorter than [0,1] :)
2013-12-17 16:30:25 +01:00
ea307931a7
fix spec, categories without position are now always at the end of the list
2013-12-17 14:36:07 +11:00
341adc93a4
Allow categories with null position, which means sort them based on activity. Mix absolutely positioned (position is not null) categories with null position categories.
2013-12-16 15:13:57 -05:00
c6fb60e0a0
FIX: S3 upload when using dots in bucket name
2013-12-16 11:44:59 +01:00
d93e4fc65d
add more info to rss feeds
2013-12-15 01:17:39 -08:00
1145e4bfd9
Fix topics_year, topics_month, topics_week for uncategorized category
2013-12-13 16:17:06 -05:00
49c3482464
Show topic and post counts by day/week/month/year on categories page
2013-12-13 15:37:45 -05:00
96fdf72d5e
rails master compatability
2013-12-13 17:04:45 +11:00
50bd05663c
Fix category ordering on categories page. I broke it.
2013-12-12 17:13:35 -05:00
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
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
1457a3792d
that fix should have been in the emoji plugin
2013-12-12 16:42:27 +01:00
be835785f8
FIX: allow new user to post emojis
2013-12-12 15:05:18 +01:00
3c80ee0b8a
✂️ scoped for Rails 4 compat
2013-12-12 00:37:04 -08:00
06dd7ffe3c
better revision history
2013-12-12 03:41:34 +01:00
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
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
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
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
2db3cfb16b
annotate models
2013-12-05 17:40:35 +11:00
abed146cc7
FIX: Category description topics shouldn't auto-close
2013-12-04 10:31:25 -05:00
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
6bbea9de0b
The Rails JSON encoder API requires `as_json` to take an optional arg
2013-11-29 21:43:44 -08:00
769223014c
FIX: Allow link redirects inside oneboxed posts
2013-11-29 14:29:49 -05:00
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
6544f39bcc
fix topic counts not updating automatically in various spots (top menu / categories page / drop down)
2013-11-25 17:37:51 +11:00
82b78ec6ba
schemaless avatar urls
2013-11-22 19:18:45 +01:00
3cf5a363f7
do not destroy uploads when destroying a user
2013-11-22 18:29:07 +01:00
f65cde3cda
do not bump posts when rebaking
2013-11-22 01:52:26 +01:00
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
2013-11-19 11:43:01 -08:00
309904ef8f
Revert "Merge pull request #1673 from aperrault/patch-04"
...
This reverts commit c9ea89bdd39ed49888fc
2013-11-19 14:08:45 -05:00
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
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
4ce81e1b01
Rename "Best Of" to "Summary"
2013-11-18 12:48:26 -05:00
ad3e276b4b
Rename TopicSummary -> TopicMap
2013-11-18 12:08:21 -05:00
dabdcf59c4
allow for arbitrary HTML at the top/bottom of every pages
2013-11-18 17:13:24 +01:00
6e1198334c
automatic groups should be bootstrapped
2013-11-18 12:53:14 +11:00
1b19444b44
URGENT FIX: code would fail in Ruby 1.9.3 exception does not exist
2013-11-18 09:32:02 +11:00
dfdc618e9a
Use File.join instead of hard-coding slashes
2013-11-15 14:34:03 -05:00
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
34bba737ff
Refactor SessionController#create, reduce complexity.
...
Don't compromise readablity
2013-11-15 22:09:03 +05:30
8a83f1a88f
add disk space usage failsafe
2013-11-15 16:48:38 +01:00
1e37abc310
Add site setting category support
2013-11-14 16:02:13 -05:00
791f5ac94e
Load site settings from config/site_settings.yml
2013-11-14 16:02:13 -05:00
67041d1c6d
Support for tracking the count of unique participants in a topic
2013-11-14 14:32:41 -05:00
07cbf8f4e3
do not customize the admin section
2013-11-14 16:41:16 +01: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
7e7d951152
do not pull hotlinked images when max_image_size_kb == 0
2013-11-13 17:30:48 +01:00
e9f9d22482
add query parameter to temporarily disable customization
2013-11-12 18:14:22 +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
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
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
c753a3c784
We shouldn't be matching on the `created_at` field. Causes tests to randomly fail.
2013-11-07 16:35:40 -05:00
0c6f794eb0
Used the term suspended instead of banned.
2013-11-07 13:53:49 -05:00
01b768392a
Remove `default_scope`
2013-11-06 16:56:49 -05:00
914b723b97
Category dropdown should be in the `position` order
2013-11-06 15:50:47 -05:00
948a545cb1
Category descriptions should not appear in digests
2013-11-06 15:05:06 -05:00
de30af9302
Support for inviting to a forum from a user's invite page.
2013-11-06 12:56:50 -05:00
25ef66c60b
User invites page now has search, displays first `invites_shown` records
2013-11-05 17:53:26 -05:00
37fd7ab574
pull hotlinked images
2013-11-05 19:07:29 +01:00
8724b2e2b6
Add comments about the IPAddr hack
2013-11-05 11:24:13 -05:00
1e21fc8c9a
fix regression in Rails 4
2013-11-05 10:32:35 +11:00
bd9b85f076
Screened Urls page shows results for each domain instead of each url
2013-11-04 16:24:48 -05:00
ede59a4386
FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available.
2013-11-04 12:51:09 -05:00
52c3457133
Site setting to support showing real names in posts. Also put back in type to search on site settings
2013-11-01 16:32:12 -04:00
92a0729937
When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs.
2013-11-01 10:47:26 -04:00
b93ca1089e
List subcategories on categories page
2013-10-31 18:02:24 -04:00
3d6d7c8abe
SiteSetting to hide regular names from users
2013-10-30 15:45:34 -04:00
6063b52d6a
Support for choosing a destination category when splitting topics.
2013-10-29 15:30:06 -04:00
f7d6ab579c
Merge pull request #1571 from novemberkilo/master
...
Refactor User#update_last_seen! and User#update_tracked_topics
2013-10-29 08:28:08 -07:00
9650dbb97c
Refactor topics controller
...
Refactor: 1) TopicsController to reduce code climate complexity.
2) Topic model, addressed comments
fix typo
2013-10-28 11:42:07 +05:30
95e936c299
cleanup API for looking up a user by email or username, add specs, fix invalid auto association in open id provider
2013-10-28 16:29:07 +11:00
f4d9bf9181
Merge pull request #1573 from railsaholic/use_existing_find_by_username_or_email
...
Utilize already existing method 'find_by_username_or_email'
2013-10-25 12:57:18 -07:00
4929c5db71
FIX: when allow_uncategorized_topics was false, PMs can not be created
2013-10-25 09:33:39 +11:00
d149066ac6
Show a warning on admin dashboard if running on an older patch level of ruby 2.0
2013-10-24 18:22:47 -04:00
61468f6f27
Can assign a parent category to a category.
2013-10-24 17:03:28 -04:00
96ae3cdacc
Utilize already existing method 'find_by_username_or_email'
...
check presence of email using include, dont use =~
2013-10-24 19:26:06 +05:30
24d732b12a
regressions post merge
2013-10-24 12:25:20 +11:00
adeb987c70
oops messed up merge
2013-10-24 12:09:49 +11:00
666264879c
change it so all topics MUST include a category, we store a special uncategorized category to compensate
...
this cleans up a bunch of internals and removes some settings
2013-10-24 12:08:02 +11:00
6ce80fd148
Refactor User#update_last_seen! and User#update_tracked_topics
2013-10-23 23:27:30 +02:00
8aab2253d0
Whitelisted ip addresses will not be flagged as spam by flag_sockpuppets
2013-10-23 17:11:35 -04:00
c814fc16a3
Database structure to support sub categories
2013-10-23 15:22:49 -04:00
c1008f4359
Fixes for postgresql inet columns in Rails 4. They're backed by an IPAddr class now, which breaks sql parameter marker support, and automatically sets the attribute to nil when trying to assign an invalid ip address.
2013-10-22 19:19:32 -04:00
DV Suresh
Sam
Neil Lalonde
Robin Ward
Godfrey Chan
Régis Hanol
Alexander
Erik Ordway
Autumn Perrault
railsaholic
Scott Albertson
sirMackk
Navin Keswani