Sam
b19400726f
BUGFIX/FEATURE: store topic changes in post revisions
...
History + edit notifications for title and category changes
2014-03-07 19:00:36 +11:00
Benjamin Kampmann
d956ca9cf7
Be more liberal when the similar content of the post to be saved turns out to be the same post
...
- instead of setting a random number, we actually store the post id in redis now
- and when checking for matching recent post and it is the same, we allow it still
Fixes the issue that we prevent a user from reverting to a previous state within the unique_posts_min time window.
2014-03-07 08:23:15 +01:00
Régis Hanol
11d91328ab
Merge pull request #2056 from vikhyat/pm-likes
...
Don't suppress like notifications in private messages
2014-03-06 14:53:27 +01:00
Vikhyat Korrapati
944246f4af
Add test to ensure creation of like notification in a PM.
2014-03-06 19:07:26 +05:30
Régis Hanol
ac99947979
BUGFIX: topic specs were dependent on Time.now
...
which would fail when DST was around
2014-03-06 12:44:52 +01:00
Sam
69b498da24
Merge pull request #2034 from birarda/custom_username_length
...
allow for custom username length via site setting
2014-03-05 12:06:23 +11:00
Stephen Birarda
4a2dab9c5e
allow for custom min_username_length
...
change constant in user to be global range and not default
2014-03-04 16:37:05 -08:00
Sam
ea553202f0
Merge pull request #2033 from birarda/master
...
add option to override user attributes from SSO payload
2014-03-05 11:33:32 +11:00
Robin Ward
aa3f7f764d
You can only reuse email tokens within 24 hours.
2014-03-04 14:03:04 -05:00
Robin Ward
90a1cb5bec
Change email token expiry to 24 hours instead of 1 week
2014-03-04 13:02:48 -05:00
Stephen Birarda
c3eb2025d8
add option to override user attributes from SSO payload
...
add an external_username attribute for username from SSO payload
repair the field name in SingleSignOnRecord migration
move setting of external_username for sso to controller
add settings toggle to override username/email from SSO payload
fix changing of external username after override toggle
complete tests and logic for sso override
add some extra context to username override option
add external_email and external_name to single sign on record
add setting for name override from SSO payload
complete override with stored external_email and external_name
add missing checks to tests
remove an unneeded describe block
break up a monster method for single sign on
fixes for sso attribute override after failed tests
2014-03-04 09:52:21 -08:00
Robin Ward
4b61d6af28
BUGFIX: new date was incorrect
2014-03-03 16:11:59 -05:00
Robin Ward
3abe84941f
FEATURE: Add `new_since` column to `UserStat` so we can reset the "New"
...
date.
2014-03-03 15:47:00 -05:00
Sam
172e517b31
Merge pull request #2012 from ligthyear/incoming-emails
...
Advanced New-Topic via Email Feature
2014-03-03 10:58:10 +11:00
Neil Lalonde
b40313559b
FIX: moderators should not be able to see site setting changes in the staff action logs. Fixes #2027
2014-02-28 16:30:54 -05:00
Régis Hanol
6b83ed0347
OPTIM: change Top Topic's score computation algorithm
...
New algorithm will not wipe the entire table anymore and will only remove
invisible topics and add new visible topics.
2014-02-28 20:33:52 +01:00
Robin Ward
67463af4f4
BUGFIX: Don't include deleted topics in activity. Deleted posts are OK.
2014-02-28 11:15:05 -05:00
Benjamin Kampmann
37cea49459
Add Email-In-Per-Category
...
- allow the configuration of an inbox-email-address per category
- post emails to that email into that category instead of global
- Adds UI for configuration
- Adds Documentation for configuration
- Adds Tests for new feature
2014-02-28 16:53:58 +01:00
Sam
560b5356d5
Revert "Use symbols instead of strings in order clause"
...
Breaks 1.9.3 compat
This reverts commit 09a2d9e12c
.
2014-02-28 15:08:50 +11:00
Robin Ward
fee9870427
FIX: New counts were taking into account muted categories
2014-02-27 12:35:33 -05:00
Nick Borromeo
09a2d9e12c
Use symbols instead of strings in order clause
...
This simply changes the strings in the order clauses in the model. The
reason of the change is because the SQL generated when using symbols
automatically name spaces the column with the table name.
Topic.order(:title).to_sql
=> SELECT "topics".* FROM "topics" ORDER BY "topics"."title" ASC
This also changes the scopes using lamba to use stabby lambas for
consistency with other scopes.
2014-02-26 22:43:03 -08:00
Sam
1992271bf9
FEATURE: white_listed_spam_host_domains for domains that are not blocked for spam
...
BUGFIX: bypass host spam detection for current host
2014-02-27 15:43:57 +11:00
Sam
a4d7942dbd
BUGFIX: Don't blow up on junk referers
2014-02-27 12:03:38 +11:00
Sam
9551f4aeea
PERF: calculate scores for topics/posts faster
...
Only look at topics that changed in last day for 15 minuted schedule
Do a full recalc weekly, just in case
2014-02-27 11:45:40 +11:00
Robin Ward
9267c162a1
FIX: Showing Unread(1) when you weren't tracking the topic. Also
...
includes performance fix when having MANY new or unread topics.
2014-02-26 15:39:45 -05:00
Sam
50a8d3caae
BUGFIX: sso to send welcome emails
2014-02-26 10:28:03 +11:00
Sam
440435f023
FEATURE: SSO to handle return_path automatically
2014-02-26 09:58:30 +11:00
Neil Lalonde
7288bf1f31
Add previous page link for crawlers
2014-02-25 12:15:48 -05:00
Robin Ward
9ebcdfba1f
Merge pull request #2005 from eriko/plugin_store_delete
...
clean up plugin store when removing data instead of setting the value to...
2014-02-25 11:36:05 -05:00
Erik Ordway
dfa6960799
clean up plugin store when removing data instead of setting the value to nil and do it a reasonable way.
2014-02-25 08:26:35 -08:00
Sam
6f31d3f0e5
FEATURE: single sign on support
...
Added support for outsourcing auth to a different website, documentation on meta
2014-02-25 14:31:03 +11:00
Erik Ordway
db411860c2
clean up plugin store when removing data instead of setting the value to nil.
2014-02-24 16:11:31 -08:00
Neil Lalonde
46d1c8c1e0
FIX: n+1 queries in CategoryList
2014-02-24 15:07:46 -05:00
Robin Ward
4cd5ccdf1f
BUGFIX: Don't return child categories if you can't see the parent
...
category.
2014-02-24 14:52:41 -05:00
Robin Ward
3151f59bc9
REFACTOR: We don't cache the json for the Site model anymore, so let's
...
rename and remove the methods leftover from that.
2014-02-24 14:25:37 -05:00
Régis Hanol
68a935c36b
FEATURE: upload backups
2014-02-22 01:41:01 +01:00
Robin Ward
a07e9f7e71
FEATURE: Bulk `reset read` status.
2014-02-21 15:18:45 -05:00
Neil Lalonde
5fd390c600
FIX: nuke spammer from flags page
2014-02-21 14:14:30 -05:00
Neil Lalonde
b696c96a19
Look at the age of a user's first post to determine if the user can be nuked, instead of looking at when the user registered.
2014-02-20 12:29:40 -05:00
Robin Ward
d56b1b1c74
Merge pull request #1975 from orend/simplify_topic_posters_summary
...
simplify TopicPostersSummary
2014-02-19 12:30:10 -05:00
Régis Hanol
d443ddd43d
Merge pull request #1922 from joallard/language-toggle
...
Allow users to toggle interface language in their preferences
2014-02-19 18:28:00 +01:00
Oren Dobzinski
d0fbabeb0b
simplify TopicPostersSummary
2014-02-18 23:53:30 -05:00
Neil Lalonde
997a7c676e
If flagging a topic with only one post, flag the post instead
2014-02-18 15:18:31 -05:00
Jonathan Allard
c513725f26
Allow users to toggle interface language in their preferences
2014-02-18 14:53:59 -05:00
Neil Lalonde
d0ecccb7e4
Translate asterisks in ip addresses to mask format so people can enter things like 127.*.*.* in screened ip addresses form
2014-02-18 13:00:55 -05:00
Neil Lalonde
6c23a1903e
FIX: show ip address with mask again on /admin/logs/screened_ip_addresses
2014-02-18 10:33:08 -05:00
Sam
884346cbea
Merge pull request #1951 from thoughtbot/bb-erb
...
Use ERB to pull conf files into app
2014-02-18 16:23:55 +11:00
Stephan Kaag
f12925887c
Drop Rails3 support
2014-02-17 19:42:08 +01:00
Sam
23af46a66c
Merge pull request #1960 from verg/subcategory-search-links
...
Fix subcategories links from search
2014-02-17 10:33:35 +11:00
verg
f723f11443
Fix subcategories links from search
2014-02-16 12:49:20 -05:00
Britt Ballard
60e1a5aa69
Use ERB when importing conf files into app
2014-02-14 16:14:55 -08:00
Neil Lalonde
35dae76bbd
Log when and why an email was not sent in email_logs
2014-02-14 13:06:39 -05:00
Régis Hanol
c82f7bb6dc
Backup model
2014-02-13 13:31:13 -08:00
Sam
c0686a6dc6
BUGFIX: regression, not handling nil count for recent report
2014-02-14 07:21:19 +11:00
Sam
bf957513ec
correctly handle empty case
2014-02-13 17:27:50 +11:00
Sam
e8aa85d783
FEATURE: unread pms go in front of notification report
...
also refactor fat controller
2014-02-13 17:27:50 +11:00
Sam
4ff6780758
Merge pull request #1935 from eriko/remove_cas
...
Remove cas
2014-02-13 17:26:20 +11:00
Robin Ward
f73a3f252a
FIX: Don't allow parent categories to be deleted. Also, remove
...
duplicated logic and rely on the server response for `can_delete`
status.
2014-02-12 17:24:25 -05:00
Robin Ward
a963dd9081
Support `embeddable_host` values that contain a HTTP/HTTPs protocol
2014-02-12 15:56:06 -05:00
Robin Ward
669247977b
FEATURE: Show the posts count on the groups page. It seems a bit odd
...
that it uses a new AJAX call, but I wanted to keep the count separate
from the group object itself.
2014-02-12 14:01:36 -05:00
Neil Lalonde
6bbc3ec3e0
Add a way to flag a topic
2014-02-12 12:57:55 -05:00
Erik Ordway
8fc5c66c55
this needs to go but did not show up in my tests but did on travis
2014-02-11 18:13:24 -08:00
Robin Ward
b035c050d2
Merge pull request #1920 from nickborromeo/list-controller
...
Extract queries to keep logic in the Categories Model
2014-02-11 15:48:20 -05:00
Sam
e2d2a955dc
BUGFIX: remove hidden posts from a users stream
2014-02-11 17:16:58 +11:00
Robin Ward
b61df08d1b
FEATURE: Admin selector to choose a primary group for a user, display it
...
and apply a CSS class to their posts.
2014-02-10 17:00:15 -05:00
Nick Borromeo
b51bebb200
Extract queries to keep logic in the Categories Model
...
This creates two methods in the Category model. This moves the model
logic to the model and just calls the Category class methods in
ListController.
This also adds tests for the two methods created in the Category
model. The motivation for this refactor is the code climate score of the
this class and readability of the code.
Please enter the commit message for your changes. Lines starting
2014-02-08 14:10:48 -08:00
Robin Ward
350eb82223
Don't include category definitions on Categories page
2014-02-07 17:01:31 -05:00
Neil Lalonde
e0df404d7e
Add site setting tos_accept_required. If enabled, users must check a box saying that they've read and accept the terms of service.
2014-02-07 16:04:13 -05:00
Robin Ward
3b617b04b0
FEATURE: First stab at groups page with member list
2014-02-07 10:44:51 -05:00
Robin Ward
e511e8a80b
Link to groups from user profile
2014-02-07 10:44:51 -05:00
Régis Hanol
e47f462f54
Merge pull request #1916 from vikhyat/pm-dominating
...
Don't notify about dominating private messages
2014-02-07 00:28:27 -08:00
Sam
93434be16d
SECURITY: reduce moderator rights
...
You can now hide particular categories from certain moderators
2014-02-07 14:11:52 +11:00
Vikhyat Korrapati
2f38316bfc
Don't notify about dominating private messages.
2014-02-07 05:49:45 +05:30
Sam
be560d4eb6
Update annotations
2014-02-07 11:07:52 +11:00
Sam
227873df78
FEATURE: proper mailing list mode
...
once enable_mailing_list_mode is enabled any user can elect
to get every post via email unless they opt out of category or topic
2014-02-07 11:07:52 +11:00
Régis Hanol
58202baa62
BUGFIX: show the draft on top page
2014-02-06 11:39:43 +01:00
Neil Lalonde
14018ec07c
FIX: topic and post counts on /categories page should include sub-categories
2014-02-05 18:39:49 -05:00
Sam
447816fe39
Merge pull request #1824 from riking/patch-2
...
Fix group matching SQL query
2014-02-06 08:07:13 +11:00
Sam
5267e5bea6
BUGFIX: emails sent from "2 replies" as opposed to correct user
2014-02-04 12:56:28 +11:00
Régis Hanol
d2974c2a15
BUGFIX: proper handling of top_menu_items
2014-02-03 16:08:00 +01:00
Sam
d0a6dd88df
FEATURE: exclude muted categories from the latest and new tabs
2014-02-03 16:05:49 +11:00
Sam
60c5eb63ce
FEATURE: collapse replies to topics
...
when you get two replies to a topic they are now collapsed as opposed to getting two notificatons.
2014-02-03 13:59:14 +11:00
Régis Hanol
ae401f0dc7
BUGFIX: JSON requests don't exclude categories from filters
2014-01-31 14:36:00 +01:00
Sam
43ceaae7ba
PERF: optimise featuring of topics and users
...
Previously this would delete all features and recreate, causing
uneeded network traffic and db pain
2014-01-30 10:32:20 +11:00
Robin Ward
e453bfa073
Work in progress: Swap out onebox code for onebox gem
2014-01-29 14:14:07 -05:00
Neil Lalonde
c8bc9bd5db
Show discourse logo as system user avatar
2014-01-29 12:29:05 -05:00
Robin Ward
2892153712
REMOVE: Get rid of the `hotness` control for good.
2014-01-29 11:54:34 -05:00
Neil Lalonde
7cc5da08fe
Track how many posts a user reads each day in user_visits
2014-01-27 11:20:19 -05:00
Neil Lalonde
90e195b2e7
More work on trust level 3 requirements page
2014-01-24 11:56:46 -05:00
Eric Carlson
6766451ab4
Add site setting for category of topics created by embedding
2014-01-23 22:25:48 -07:00
Neil Lalonde
ae3b53bb76
Add a page in admin to view trust level 3 requirements for a user. Only shows for users who are currently at trust level 2.
2014-01-22 18:17:45 -05:00
Sam
7e5a17f277
FEATURE: mute/watch/track buttons for private conversations
2014-01-22 17:46:52 +11:00
Neil Lalonde
da825451d0
Invite link can't be used to log in after you set a password or sign in with 3rd party
2014-01-21 16:56:41 -05:00
Neil Lalonde
1dbc1c56b4
FIX: inviting a user again after the first invite expires will create a new invite
2014-01-21 16:56:40 -05:00
Neil Lalonde
ba74226346
FIX: invited users get clearer messaging when setting a password for the first time
2014-01-21 12:42:26 -05:00
Régis Hanol
26b7bf388e
BUGFIX: JS error when login_required is enabled
2014-01-20 14:41:11 +01:00
Sam
76a250300a
BUGFIX: filter by topic
2014-01-20 17:53:30 +11:00
Sam
b85e5dc191
FEATURE: collapse PM notifications
2014-01-20 16:18:43 +11:00
Régis Hanol
129617b415
Lots of bugfixes
...
BUGFIX: navigation bar should always activate the right tab (even when diging into a top period)
BUGFIX: /top pages titles
BUGFIX: no "edit category" button on /top page after visiting a category
BUGFIX: properly hide category columns when there is no children category (on both filter + top pages)
BUGFIX: promises not caught when scrolling down a topic list to load more of them
BUGFIX: CSS on category dropdowns
Updated `top_menu` i18n with available filters
2014-01-18 19:27:25 +01:00
Robin Ward
4981525047
REFACTOR: Fixes poor class hierarchy for listing topics
...
- Upgrades Ember to latest
- Fixes a bunch of bugs with page titles and missing "active" states
2014-01-18 19:26:24 +01:00
Robin Ward
3bbe595d10
Merge pull request #1826 from nporteschaikin/patch-1
...
Delegate :username rather than using a class method.
2014-01-17 13:54:11 -08:00
Neil Lalonde
1806a7d4b3
Trust Level 3: invited users start at default_invitee_trust_level + 1, unless default_invitee_trust_level is 2 or higher
2014-01-17 11:12:00 -05:00
Régis Hanol
c1a66b70bb
BUGFIX: use previous_visit_at instead of last_seen_at to determine the best period to display in the top summary
2014-01-16 01:36:32 +01:00
Régis Hanol
462c6d81f5
BUGFIX: exclude categories from the top view
2014-01-16 00:49:58 +01:00
Neil Lalonde
2a33a35566
Staff can create uncategorized topics even if allow_uncategorized_topics is false
2014-01-15 15:58:29 -05:00
Neil Lalonde
89908cdb47
Admins don't see uncategorized on /categories if it has no topics and allow_uncategorized_topics is false
2014-01-15 14:11:36 -05:00
Neil Lalonde
4f6b208e8d
Posts by trust level 3 users do not have nofollow on their external links.
2014-01-15 11:40:51 -05:00
Sam
abe814412e
Source DB config more cleanly, fixes issues with socket in prd
2014-01-15 12:08:35 +11:00
Robin Ward
9097368038
FIX: Incorrect string match
2014-01-14 15:38:12 -05:00
Robin Ward
4f6283ba56
FIX: Accept HTTPS or HTTP urls on redirect
2014-01-14 15:02:05 -05:00
riking
0dd317dd74
Change to case-insensitive matching in group @name matching
2014-01-14 10:32:19 -08:00
Kane York
24e30aff87
Fix group matching SQL query
...
The check there is intended for the :members_mods_and_admins level, which is not automatically checked for normal users. Instead, the :everyone level is the one used, which would always fulfill the "alias_level in :levels" check.
This changes the :everyone level to :members_mods_and_admins, which was originally intended.
2014-01-14 10:31:36 -08:00
Régis Hanol
92cb52e76e
BUGFIX: groups page wasn't working
2014-01-14 19:18:04 +01:00
Noah Portes Chaikin
108e7aec9f
Delegate :username rather than using a class method.
...
This is just a little cleaner?
2014-01-14 11:15:35 -05:00
Sam
2b64118df1
Merge pull request #1782 from ligthyear/group-mention
...
Allow groups to be used as aliases for user mentions
2014-01-12 14:36:45 -08:00
Neil Lalonde
52580f09af
Rename favorite to starred everywhere
2014-01-10 14:54:19 -05:00
Robin Ward
af9b7bfee2
Add support for lists to readability topic importing.
2014-01-09 15:49:38 -05:00
Neil Lalonde
259295d865
Add post_edit_time_limit site setting to limit the how long a post can be edited and deleted by the author. Default is 1 year.
2014-01-09 11:55:04 -05:00
Sam
1533a1163c
use_ssl is just confusing, it means use_https , fix name of setting
2014-01-09 10:51:38 +11:00
Sam
e8dcd8ab71
BUGFIX: show uncategorized in tracking etc
...
BUGFIX: allow emptying of lists of watched / tracked
BUGFIX: page scrolls when clicking on [x]
2014-01-08 17:10:16 +11:00
Benjamin Kampmann
7cbe92d5b6
move alias levels into enums
2014-01-08 03:47:01 +11:00
Régis Hanol
e732aa8a86
BUGFIX: we should not store absolute urls for locally uploaded avatar templates
...
Highly recommended to run: `RAILS_ENV=production bundle exec rake avatars:regenerate` to fix the avatar templates stored in the database.
2014-01-07 17:45:06 +01:00
Benjamin Kampmann
c743a985a4
Allow groups to be used as aliases for user mention
...
when configured by the admin a group can be found through the @mentions
feature in both the compose/reply and the private message user-selectors
and once selected the mention will be replaced by the list of users in
the group
2014-01-08 02:36:24 +11:00
Régis Hanol
871adc0b0f
BUGFIX: Top page wasn't display any topics
2014-01-07 00:37:14 +01:00
Sam
eeb83adf71
BUGFIX: staff can now edit delted posts
...
fixes #1343
This was way easier than mucking with the UI
2014-01-06 18:12:51 +11:00
Sam
6befdceabf
BUGFIX: UserStat spec was over ambitious with its mocking
2014-01-06 16:50:55 +11:00
Robin Ward
1ffcf39448
Make embedded comments look nicer
2014-01-03 12:52:42 -05:00
Régis Hanol
fd36fa1c2f
make sure we do not count system user's posts
2014-01-03 17:27:55 +01:00
Régis Hanol
2cecc0b21f
make sure we only count regular posts when calculating Top score
2014-01-03 16:56:03 +01:00
Régis Hanol
28bf78d801
BUGFIX: make sure we only show topics that have a useful score in the Top page
2014-01-03 09:15:10 +01:00
Régis Hanol
edc154251d
FEATURE: improve the TOP page scoring formula a bit
2014-01-02 22:38:35 +01:00
Neil Lalonde
a897c2b091
Add default_external_links_in_new_tab site setting
2014-01-02 15:27:37 -05:00
Robin Ward
f145060315
Don't employ the "too many replies" if the user is staff, or if they created the topic.
...
See: http://meta.discourse.org/t/what-is-the-point-of-limiting-new-users-to-three-replies-per-topic/11696
2014-01-02 12:57:40 -05:00
Régis Hanol
abf910d210
FEATURE: allow for custom HTML inside the <head> tags
2014-01-02 16:22:04 +01:00
Sam
2da5d2311b
FEATURE: Added UI for adding and removing watched and muted categories
2014-01-02 17:59:08 +11:00
Sam
b482b280d6
FEATURE: Basic backend support for muted and watched categories
2014-01-02 12:00:29 +11:00
Sam
126433cf65
Merge pull request #1744 from verg/prevent_delete_uncategorized
...
Prevent deleting 'uncategorized' category
2014-01-01 16:09:49 -08:00
Sam
2ad190b9f6
FEATURE: allow for additional plugin defined global settings
2014-01-02 10:46:09 +11:00
Robin Ward
4f8aed295a
FEATURE: Embeddable Discourse comments, now with simple-rss instead of feedzirra
2013-12-31 15:01:22 -05:00
Robin Ward
62db063e1e
Revert "Support for Embeddable Comments via IFRAME" - it depends on Curl
...
which not every server has. Have to rethink this.
This reverts commit e3e4c62887
.
2013-12-31 12:52:31 -05:00
Robin Ward
e3e4c62887
Support for Embeddable Comments via IFRAME
2013-12-31 12:26:24 -05:00
verg
8a830fb8e3
Prevent deleting 'uncategorized' category
2013-12-31 11:22:44 -06:00
Sam
1915f292ad
BUGFIX: invalid referer would cause 500 errors
2013-12-30 14:05:44 +11:00
Sam
db1d01d1a2
Discourse as a Mailing List improvements
...
FEATURE: context is not emailed if we previously emailed you the post
FEATURE: site setting to enable_watch_new_topics , false by default.
When enables users can elect to watch everything by default
FIX: Custom email subjects (x quoted you in [title], x replied to [title])
was removed, this broke email grouping. TBD, include info in footer somehow
FIX: topic user specs were messy, reduce side effects
2013-12-30 13:02:12 +11:00
Neil Lalonde
1781b290cb
Fix top_topic.rb to be compatible with ruby 1.9
2013-12-27 16:16:25 -05:00
Neil Lalonde
90bf3cc3d4
Merge pull request #1760 from dv2/fix_spelling
...
Correct few spelling in the comments
2013-12-27 11:00:02 -08:00
Régis Hanol
b5a59c10d5
let's try another formula for the top tab
2013-12-27 19:12:53 +01:00
Régis Hanol
9c8e50351d
first stab at calculating the score of a topic for the top tab
2013-12-27 18:10:35 +01:00
Régis Hanol
567d2bd23c
add top page
2013-12-24 00:50:36 +01:00
Régis Hanol
0b13b8d7ea
Merge pull request #1737 from chancancode/add_missing_references
...
Added some missing references
2013-12-23 05:51:04 -08:00
DV Suresh
24886c300b
Correct few spelling in the comments
2013-12-21 01:19:22 -06:00
Sam
2cf2ee9d2d
I need to add better testing here
2013-12-20 17:41:12 +11:00
Sam
cc9326c29d
existence in file always overrides
2013-12-20 17:09:51 +11:00
Sam
61a50f1cf6
allow nuking of vars via env
2013-12-20 17:07:08 +11:00
Sam
13e1016d73
oops forgot to commit this
2013-12-20 16:38:51 +11:00
Sam
f5f09933df
Merge branch 'master' of github.com:discourse/discourse
2013-12-20 16:17:52 +11:00
Sam
7b8d2547d0
globals now implemented and documented
2013-12-20 16:17:21 +11:00
Sam
b312b4d563
clean up config to use global settings
2013-12-20 15:12:23 +11:00
Neil Lalonde
33c6997ded
Move password validation into PasswordValidator
2013-12-19 16:15:47 -05:00
Robin Ward
1cac9fa257
New users can only post `newuser_max_replies_per_topic` times per topic.
2013-12-19 13:45:55 -05:00
Neil Lalonde
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
Godfrey Chan
e41eecb91b
Added some missing references, see https://github.com/rails/rails/issues/12982
2013-12-18 15:06:19 -08:00
Neil Lalonde
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
Neil Lalonde
c0e1ef75f6
Don't auto-close a topic too soon in PeriodicalUpdates
2013-12-18 14:09:49 -05:00
Neil Lalonde
8057373584
Category featured users: show most recent posters instead of most frequent posters
2013-12-18 11:10:03 -05:00
Régis Hanol
2ef53f89f4
[0] is shorter than [0,1] :)
2013-12-17 16:30:25 +01:00
Sam
ea307931a7
fix spec, categories without position are now always at the end of the list
2013-12-17 14:36:07 +11:00
Neil Lalonde
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
Régis Hanol
c6fb60e0a0
FIX: S3 upload when using dots in bucket name
2013-12-16 11:44:59 +01:00
Alexander
d93e4fc65d
add more info to rss feeds
2013-12-15 01:17:39 -08:00
Neil Lalonde
1145e4bfd9
Fix topics_year, topics_month, topics_week for uncategorized category
2013-12-13 16:17:06 -05:00
Neil Lalonde
49c3482464
Show topic and post counts by day/week/month/year on categories page
2013-12-13 15:37:45 -05:00
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
Robin Ward
948a545cb1
Category descriptions should not appear in digests
2013-11-06 15:05:06 -05:00
Robin Ward
de30af9302
Support for inviting to a forum from a user's invite page.
2013-11-06 12:56:50 -05:00
Robin Ward
25ef66c60b
User invites page now has search, displays first `invites_shown` records
2013-11-05 17:53:26 -05:00
Régis Hanol
37fd7ab574
pull hotlinked images
2013-11-05 19:07:29 +01:00
Neil Lalonde
8724b2e2b6
Add comments about the IPAddr hack
2013-11-05 11:24:13 -05:00
Sam
1e21fc8c9a
fix regression in Rails 4
2013-11-05 10:32:35 +11:00
Neil Lalonde
bd9b85f076
Screened Urls page shows results for each domain instead of each url
2013-11-04 16:24:48 -05:00
Neil Lalonde
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
Robin Ward
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
Neil Lalonde
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
Robin Ward
b93ca1089e
List subcategories on categories page
2013-10-31 18:02:24 -04:00
Robin Ward
3d6d7c8abe
SiteSetting to hide regular names from users
2013-10-30 15:45:34 -04:00
Robin Ward
6063b52d6a
Support for choosing a destination category when splitting topics.
2013-10-29 15:30:06 -04:00
Robin Ward
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
Manoj
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
Sam
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
Robin Ward
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
Sam
4929c5db71
FIX: when allow_uncategorized_topics was false, PMs can not be created
2013-10-25 09:33:39 +11:00
Neil Lalonde
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
Robin Ward
61468f6f27
Can assign a parent category to a category.
2013-10-24 17:03:28 -04:00
Manoj
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
Sam
24d732b12a
regressions post merge
2013-10-24 12:25:20 +11:00
Sam
adeb987c70
oops messed up merge
2013-10-24 12:09:49 +11:00
Sam
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
Navin Keswani
6ce80fd148
Refactor User#update_last_seen! and User#update_tracked_topics
2013-10-23 23:27:30 +02:00
Neil Lalonde
8aab2253d0
Whitelisted ip addresses will not be flagged as spam by flag_sockpuppets
2013-10-23 17:11:35 -04:00
Robin Ward
c814fc16a3
Database structure to support sub categories
2013-10-23 15:22:49 -04:00
Neil Lalonde
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