Skip to content

Merge *master* into *canary* #2688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 123 commits into from
Feb 26, 2018
Merged

Merge *master* into *canary* #2688

merged 123 commits into from
Feb 26, 2018

Conversation

Awk34
Copy link
Member

@Awk34 Awk34 commented Feb 26, 2018

No description provided.

greenkeeperio-bot and others added 30 commits December 1, 2016 02:45
chore(package): upgrade to Angular 1.6
…st-1.6.0

Update yeoman-test to version 1.6.0 🚀 [skip ci]
ci(circle): change build order to cache deps
Display form field error when using sequelize as database

fixes #2400
fix(webpack:css): disable css-loader sourceMap option
There is no reason to run ```gulp serve:dist``` after you build the first time. This will clear your web.config from your `client` folder.
- It wasn't compiling right away (got rid of bower)
- Also the tooling was needed from node-gyp
- And some caching between builds
Awk34 and others added 24 commits May 20, 2017 20:38
fix(seed): CRSF and token issues
…elize-session

The former is no longer maintained and triggers warnings regarding unhandled promises.
Replace express-sequelize-session with connect-session-sequelize
fix(server:auth): specify digest for pbkdf2
chore(server): switch back from shrink-ray to compression
@Awk34 Awk34 force-pushed the merge-master-to-canary branch from a1e9c06 to ca4bb55 Compare February 26, 2018 05:44
@Awk34 Awk34 merged commit ab5aad6 into canary Feb 26, 2018
@Awk34 Awk34 deleted the merge-master-to-canary branch February 26, 2018 23:28
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.