Skip to content

Merging Appsembler/ficus/develop to Appsembler/ficus/master - #150

Merged
amirtds merged 17 commits into
appsembler/ficus/masterfrom
appsembler/ficus/develop
Aug 9, 2017
Merged

Merging Appsembler/ficus/develop to Appsembler/ficus/master#150
amirtds merged 17 commits into
appsembler/ficus/masterfrom
appsembler/ficus/develop

Conversation

@amirtds

@amirtds amirtds commented Aug 8, 2017

Copy link
Copy Markdown

We need this PR be merged for the asu prod (ficus)

bryanlandia and others added 17 commits June 26, 2017 14:35
…activation-email-for-sites

Use site_configuration helper to get url base for activation email
…round

[Ficus] Enable CORS headers http referee replace and middleware
…rm-fields

[Ficus] sync custom forms fields on SSO registration
…course-duration-field

add editable field for custom course duration
merge migrations

add new migration

fix import

change import

remove wrong merge

merge custom redirect URL feature

add missing import
…l-microsite

[Ficus] make custom redirect URL microsite aware
…-param-for-email-sending

add conditional to read boolean for email sending on user creation
@amirtds

amirtds commented Aug 8, 2017

Copy link
Copy Markdown
Author

@melvinsoft melvinsoft left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 LTBM

@amirtds
amirtds requested a review from tkeemon August 9, 2017 16:27
@amirtds
amirtds merged commit 43a3678 into appsembler/ficus/master Aug 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants