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
Sam
9ca61efa97
correct test
2015-02-25 18:09:45 +11:00
Sam
8248abf73c
UX: clean up box category styling
2015-02-25 17:42:10 +11:00
Sam
b760d22460
PERF: avoid expensive order by random for suggested topics
2015-02-25 17:19:12 +11:00
Sam
7b6e85cb6c
remove unused api call
...
correct spec
2015-02-25 14:39:50 +11:00
Sam
3658c21fc5
REGRESSION: incorrect ordering when featuring topics
2015-02-25 14:24:25 +11:00
Sam
fe578f9944
FEATURE: Allow manual assignment of related post to badge
...
PERF: clean up performance of user badges admin when large number of badges exist
2015-02-25 12:53:01 +11:00
riking
31d2098dc6
FIX: Reenable console output for verbose localization
2015-02-24 12:20:51 -08:00
Robin Ward
ff842758e1
Merge pull request #3230 from jamielinux/gzip-k
...
Avoid gzip "-k" option for wider OS compatibility
2015-02-24 14:42:07 -05:00
Robin Ward
042031ecb0
Merge pull request #3231 from erpe/css_fixes
...
add line-height on page-not-found for h1
2015-02-24 14:38:19 -05:00
Robin Ward
3f729438ad
ES6: Removed and renamed some admin views
2015-02-24 13:47:46 -05:00
Robin Ward
5a7ae8c63f
Clicking on the date of a featured topic should show topic entrance
2015-02-24 12:56:06 -05:00
Rene Paulokat
74845948ca
add line-height on page-not-found for h1
2015-02-24 17:28:32 +01:00
Robin Ward
7e2dd2463e
Bump onebox version.
2015-02-24 10:50:19 -05:00
Jamie Nguyen
5d16db1c48
Avoid gzip "-k" option for wider OS compatibility
...
The "-k" option tells gzip to keep the original files intact and is an
alternative to `gzip -c file > file.gz`. It was implemented in 2013:
http://git.savannah.gnu.org/cgit/gzip.git/commit/?id=0192f02
There are a few popular operating systems (ie, Red Hat 7, Debian Wheezy)
whose version of gzip does not have the "-k" option. Compiling assets
breaks on these operating systems. Using "-c" instead ensures that it
works even with older versions of gzip.
2015-02-24 15:19:23 +00:00
Régis Hanol
34af7f20af
Merge pull request #3228 from riking/describe
...
FEATURE: Use `git describe` for dashboard version
2015-02-24 11:45:57 +01:00
Sam
e9c5e17fbe
PERF: disable PM stats when explicitly omitting stats
2015-02-24 13:39:31 +11:00
Sam
130dbf7358
PERF: don't run stats query in user card
2015-02-24 13:31:23 +11:00
Sam
8c7cce1bfc
PERF: added missing indexes for pinned topics
2015-02-24 11:53:32 +11:00
Sam
738f2cb72c
REGRESSION: pms not ordering on bumped_at descending
2015-02-24 11:28:17 +11:00
riking
f1b606bf08
FEATURE: Use git describe for dashboard version
2015-02-23 16:07:08 -08:00
Sam
0ccce7a59b
Merge pull request #3227 from sigginet/patch-1
...
FIX: Forward to SSO login automatically
2015-02-24 10:42:30 +11:00
Robin Ward
34dc1f9e10
Spec to ensure that SSO respects blocked emails
2015-02-23 17:14:54 -05:00
Sigurður Guðbrandsson
96e6fd3449
Cleaned up the sso codefix, thanks @SamSaffron
...
@SamSaffron showed me a cleaner way to use the if statements in the sso redirect code.
Thanks sam ;)
2015-02-23 22:10:44 +00:00
Sigurður Guðbrandsson
334a357363
FIX: Forward to SSO login automatically
...
Forward to SSO login URL automatically if SSO is enabled and login is required.
Makes it simpler for users to log in automatically.
2015-02-23 21:20:36 +00:00
Robin Ward
ca5730018a
FIX: SSO code should respect IP address filters
2015-02-23 16:01:46 -05:00
Robin Ward
d63aed69f7
Merge pull request #3226 from techAPJ/patch-3
...
FEATURE: new site setting contact_url
2015-02-23 13:28:44 -05:00
Robin Ward
8186d86f38
FIX: Enforce max length for custom user fields
2015-02-23 13:02:30 -05:00
Arpit Jalan
a25e3cca8e
FEATURE: new site setting contact_url
2015-02-23 23:09:13 +05:30
Robin Ward
9264a7914f
Removed a bunch of Discourse.Site globals
2015-02-23 12:36:04 -05:00
