Commit graph

15511 commits

Author SHA1 Message Date
Robin Ward
b8ef93e0a1 FIX: Don't show similar topics with no results 2015-02-27 15:43:18 -05:00
Neil Lalonde
c04b214910 FEATURE: don't allow username and email to be the same 2015-02-27 13:47:43 -05:00
Robin Ward
17d07a8b9a Adds a new plugin_changed notification reason for plugins to use 2015-02-27 11:58:52 -05:00
Robin Ward
1ca43d3bb9 Store and Adapter support for finding by id, updating a simple record 2015-02-27 10:33:39 -05:00
Robin Ward
3d3b70f4bb Remove duplicated NotificationType globals 2015-02-27 10:33:39 -05:00
Robin Ward
be9feeb918 Replace CurrentUserMixin with an injected currentUser
This is a lot simpler and removes the need for stubbing singletons
in unit tests.
2015-02-27 10:33:39 -05:00
Robin Ward
1f716f5514 Convert Notification button to a component 2015-02-27 10:33:39 -05:00
Robin Ward
3c3e08147b Fix some weird indentation 2015-02-27 10:33:39 -05:00
Sam
b916108927 be a bit more forgiving with reloader 2015-02-27 17:19:30 +11:00
Sam
f555bbb416 FEATURE: long descriptions for badges to help teach people 2015-02-27 17:19:18 +11:00
Sam
6a20d12772 don't fail serializing if title is missing 2015-02-27 13:22:52 +11:00
Sam
71d6266f98 REGRESSION: exceptions are handled natively by logster 2015-02-27 13:05:51 +11:00
Sam
9d3c7f4a52 FIX: update logster fixes ?test causing a 500 2015-02-27 12:30:34 +11:00
Sam
4806004185 update rack-mini-profiler 2015-02-27 12:22:00 +11:00
Sam
0742f340f9 FEATURE: allow for a localized error when a regex fails in site settings
FEATURE: apply string validation to list site settings (so we get regex)
2015-02-27 11:45:56 +11:00
Sam
ea40dd08e6 correct tests 2015-02-27 09:41:08 +11:00
Jeff Atwood
68806f40fd require latest in topnav string 2015-02-26 14:01:34 -08:00
Sam
5cab84b4b2 Merge pull request #3239 from riking/edit-perms
FIX: TL3 could retitle restricted topics
2015-02-27 08:38:10 +11:00
Sam
7b2c575fbf Merge pull request #3242 from kennym/patch-1
Fix CORS issue when avatar url is on S3
2015-02-27 08:36:42 +11:00
Kenny Meyer
a89e3d0d14 Fix CORS issue when avatar url is on S3 2015-02-26 18:34:37 -03:00
Régis Hanol
7b92100a97 Merge pull request #3240 from techAPJ/patch-1
FIX: convert all emojis to text in short email notifications
2015-02-26 17:24:15 +01:00
Arpit Jalan
228d3240eb FIX: convert all emojis to text in short email notifications 2015-02-26 21:16:01 +05:30
Régis Hanol
7d8dd9d93b fix some rspec deprecations 2015-02-26 13:05:20 +01:00
Régis Hanol
13e5c02643 FIX: convert all emojis to text in short email notifications 2015-02-26 12:50:56 +01:00
Régis Hanol
fc6e7f5667 some ES6 refactoring 2015-02-26 11:07:21 +01:00
riking
1c0658e204 FIX: People could retitle restricted topics
Sort of a security fix but not really
2015-02-25 21:09:53 -08:00
Sam
8772643e63 Rails upgrade changed behavior of column/table renames 2015-02-26 16:04:26 +11:00
Sam
ff4bbf51d2 Gem updates 2015-02-26 15:29:04 +11:00
Sam
c02f1b026a add extra safety so offset can not be negative 2015-02-26 14:48:56 +11:00
Sam
9981257880 FIX: only add user to invited groups once 2015-02-26 14:05:44 +11:00
Sigurður Guðbrandsson
83f719fb80 FIX: Cleaned the commit
Only changing the code I changed, not other tests.
2015-02-26 01:24:21 +00:00
Sigurður Guðbrandsson
73068d5fa3 ADD: Spec tests for User Badge triggers
NOTE: The DiscourseEvent trigger mechanism is VERY weird.
If there are ANY triggers triggered in the chain, you can't only list the one you're looking for, you have to list all triggers in the order they will come.

Example: line 98-100
:user_created and :user_verified are triggers that are introduced in PR #3237 so if this PR is accepted but not PR #3237 then lines 98-99 need to be removed.
2015-02-26 00:55:17 +00:00
Sigurður Guðbrandsson
bee3bbdc05 FIX: the badge triggers broke
Needed to add self. for the badge trigger variables, otherwise it breaks everything ;)
2015-02-26 00:50:58 +00:00
Sam
cbe18eb0df FEATURE: allow view exclusion using custom header
Set Discourse-Track-View to either "0" or "false" to exclude request
2015-02-26 11:41:11 +11:00
Robin Ward
3e2ba5b30b FIX: If an IP is blocked, don't allow people to login using it 2015-02-25 16:02:40 -05:00
Régis Hanol
1a070b16e4 FIX: use the 'post edit time limit' for topics too 2015-02-25 20:53:21 +01:00
Robin Ward
005b8bf7c3 FIX: When creating a SSO user via sync, do not user the IP address. 2015-02-25 14:41:23 -05:00
Robin Ward
40bae7bac0 Merge pull request #3238 from techAPJ/update-translations
Update Translations
2015-02-25 13:02:19 -05:00
Sigurður Guðbrandsson
15e54c715f FIX: Added two user badge triggers
Created two triggers that trigger events when a badge is granted or removed.

Trigger 1:
user_badge_granted
 Variable - badge_id
 Variable - user_id

Trigger 2:
user_badge_removed
 Variable - badge_id
 Variable - user_id
2015-02-25 17:23:57 +00:00
Arpit Jalan
253ba977ef Update Translations 2015-02-25 22:47:17 +05:30
Neil Lalonde
cf81b3f86d FEATURE: don't allow username and password to be the same 2015-02-25 12:00:13 -05:00
Robin Ward
bcb0346595 FIX: Support text only logos when activating account. 2015-02-25 11:36:06 -05:00
Régis Hanol
cf00e73ed8 Merge pull request #3234 from fullfatthings/add_remove_group_members_by_id_or_name
Allow adding and removing members of groups by username or id
2015-02-25 17:30:25 +01:00
Régis Hanol
8c5d8715cd FIX: staff action logs not logging all changes 2015-02-25 17:18:22 +01:00
Robin Ward
3de5b1799e Merge pull request #3235 from techAPJ/patch-1
FEATURE: add canonical tag to category latest page
2015-02-25 11:04:19 -05:00
Arpit Jalan
a8b927da91 FEATURE: add canonical tag to category latest page 2015-02-25 20:46:45 +05:30
Dan Singerman
1c545d4c1e Allow adding and removing members of groups by username or id
As discussed here: https://meta.discourse.org/t/discourse-gem-group-add/25668/2.
2015-02-25 14:52:13 +00:00
Régis Hanol
d5828d3743 FIX: don't use 'convert' to optimize GIF + refactor 2015-02-25 15:08:33 +01:00
Régis Hanol
01b4fd16cd Merge pull request #3233 from techAPJ/patch-1
UX: move Custom fields up in user preferences
2015-02-25 12:19:59 +01:00
Arpit Jalan
337a59ec14 UX: move Custom fields up in user preferences 2015-02-25 16:43:26 +05:30