Skip to content
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

[NEW] Setup Wizard #10523

Merged
merged 57 commits into from
May 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
8fd26d1
welcome
karlprieb Mar 14, 2018
237dbff
Merge branch 'develop' into setup-wizard
karlprieb Mar 14, 2018
54c8f79
.
karlprieb Mar 20, 2018
b86b2f5
Merge branch 'develop' into setup-wizard
karlprieb Mar 26, 2018
7a54d40
stylelint
karlprieb Mar 27, 2018
ca5d683
Merge branch 'develop' into setup-wizard
karlprieb Apr 2, 2018
b46f0f5
new ilustration
karlprieb Apr 4, 2018
e2b6ff9
Merge branch 'develop' into setup-wizard
karlprieb Apr 16, 2018
7be3d7b
Merge branch 'develop' into setup-wizard
karlprieb Apr 18, 2018
00c5f99
new layout
karlprieb Apr 19, 2018
8c93d75
.
karlprieb Apr 19, 2018
54d0b27
implements dicts
karlprieb Apr 19, 2018
a5622f0
added all setup wizard settings to wizard
karlprieb Apr 20, 2018
d7d9fc8
fix some setup wizard css
karlprieb Apr 20, 2018
0d80778
Merge branch 'develop' into setup-wizard
karlprieb Apr 20, 2018
408ca5c
fix setup wizard js linter errors
karlprieb Apr 20, 2018
b189b54
remove old setup wizard templaates
karlprieb Apr 20, 2018
0fad25a
setup wizard has just one main tag now
karlprieb Apr 20, 2018
5d445ac
setup wizard registration fields filter is more readable
karlprieb Apr 20, 2018
9346301
add register server page to setup wizard
karlprieb Apr 20, 2018
d3d8a02
fix setup wizard progress bar on RTL
karlprieb Apr 20, 2018
40e8df2
setup wizard is registering users
karlprieb Apr 21, 2018
e69ced8
Merge branch 'develop' into setup-wizard
engelgabriel Apr 21, 2018
4f7d450
Add setup wizard tests, routes and fix batch
karlprieb Apr 26, 2018
b6a2f05
Merge branch 'develop' into setup-wizard
karlprieb Apr 26, 2018
0f8b4d4
fix setup wizard tests
karlprieb Apr 26, 2018
567f3f0
add api test back
karlprieb Apr 27, 2018
2e9f935
comment rocketchat:google-natural-language package and remove logs
karlprieb Apr 27, 2018
f25fda6
add some translation keys for setup wizard
karlprieb Apr 27, 2018
54b723d
remove old setup wizard template
karlprieb Apr 27, 2018
587e1ce
fix sort code on setup wizard
karlprieb Apr 27, 2018
e8a82a1
fix getWizardSetting method
karlprieb Apr 27, 2018
1c92426
Merge branch 'develop' into setup-wizard
karlprieb Apr 27, 2018
e227f89
new migration for setupwizard
karlprieb Apr 27, 2018
56f0b70
setup wizard setting migration
karlprieb Apr 27, 2018
bb8bee7
fix setupwizard migration
karlprieb Apr 28, 2018
2c924e3
Update versions
karlprieb Apr 28, 2018
753db8d
Merge branch 'develop' into setup-wizard
karlprieb May 4, 2018
3ac3962
fix some setup wizard code logic
karlprieb May 4, 2018
741a601
fix setup wizard registerServer setting
karlprieb May 4, 2018
e4747f0
Merge branch 'develop' into setup-wizard
rodrigok May 6, 2018
f66f900
rever package-lock.json
karlprieb May 7, 2018
f8d943f
rever google-natural-language .npm folder
karlprieb May 7, 2018
f12a565
rever meteor packages file and add setup wizard
karlprieb May 7, 2018
391f0f3
remove some default values from setup wizard settings
karlprieb May 7, 2018
7fd2a3e
add advocacy option on setup wizard industry setting
karlprieb May 7, 2018
7ebb55b
change key name to setting to make the filter more readable on setup …
karlprieb May 7, 2018
03fb210
change key name to setting to make the filter more readable on setup …
karlprieb May 7, 2018
d8f97df
add findWizardSettings on models Settings and handle errors of getWiz…
karlprieb May 7, 2018
349854b
change setting to key to make the filter more readable on setup wizard
karlprieb May 7, 2018
af3aad4
fix setup wizard settings filter map
karlprieb May 7, 2018
4200251
remove serverHasAdminUser method on setup wizard
karlprieb May 7, 2018
6866c9d
fix setup wizard tests
karlprieb May 8, 2018
7083036
fix setup wizard final step workspace link
karlprieb May 8, 2018
7e2d735
fix setup wizard tests
karlprieb May 8, 2018
cdbf9e5
Merge remote-tracking branch 'origin/develop' into setup-wizard
rodrigok May 9, 2018
e0084f6
Merge remote-tracking branch 'origin/develop' into setup-wizard
rodrigok May 9, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
"parentCall" : false,
"Promise" : false,
"Random" : false,
"ReactiveDict" : false,
"ReactiveVar" : false,
"Reload" : false,
"RocketChat" : true,
Expand Down
1 change: 1 addition & 0 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ rocketchat:push-notifications
rocketchat:reactions
rocketchat:apps
rocketchat:sandstorm
rocketchat:setup-wizard
rocketchat:slackbridge
rocketchat:slashcommands-archive
rocketchat:slashcommands-asciiarts
Expand Down
1 change: 1 addition & 0 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ rocketchat:push-notifications@0.0.1
rocketchat:reactions@0.0.1
rocketchat:sandstorm@0.0.1
rocketchat:search@0.0.1
rocketchat:setup-wizard@0.0.1
rocketchat:slackbridge@0.0.1
rocketchat:slashcommands-archive@0.0.1
rocketchat:slashcommands-asciiarts@0.0.1
Expand Down
16 changes: 16 additions & 0 deletions client/routes/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,22 @@ FlowRouter.route('/register/:hash', {
}
});

FlowRouter.route('/setup-wizard', {
name: 'setup-wizard',

action() {
BlazeLayout.render('setupWizard');
}
});

FlowRouter.route('/setup-wizard/final', {
name: 'setup-wizard-final',

action() {
BlazeLayout.render('setupWizardFinal');
}
});

FlowRouter.notFound = {
action() {
BlazeLayout.render('pageNotFound');
Expand Down
2 changes: 1 addition & 1 deletion client/startup/userSetUtcOffset.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import moment from 'moment';

Meteor.startup(function() {
Tracker.autorun(function() {
const user = Meteor.user();
const user = RocketChat.models.Users.findOne({_id: Meteor.userId()}, {fields: {statusConnection: 1, utcOffset: 1}});
if (user && user.statusConnection === 'online') {
const utcOffset = moment().utcOffset() / 60;
if (user.utcOffset !== utcOffset) {
Expand Down
7 changes: 6 additions & 1 deletion packages/rocketchat-assets/server/assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ const assets = {
extensions: ['svg', 'png', 'jpg', 'jpeg'],
width: undefined,
height: undefined
},
wizard: {
step: 3,
order: 2
}
},
favicon_ico: {
Expand Down Expand Up @@ -296,7 +300,8 @@ function addAssetToSetting(key, value) {
fileConstraints: value.constraints,
i18nLabel: value.label,
asset: key,
public: true
public: true,
wizard: value.wizard
});
}

Expand Down
Loading