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
