Commit graph

15 commits

Author SHA1 Message Date
zmagod 9eac014f1a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-09 09:05:22 +01:00
Luka Murn dfa1c83c9f Merge branch 'lm-add-flow-to-validation' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-add-flow-to-validation
Conflicts:
	flow-typed/npm/lodash_v4.x.x.js
2017-11-08 09:33:29 +01:00
Luka Murn 7cb159c1a3 Add updated flow-types 2017-11-07 17:31:12 +01:00
zmagod 54e360bb52 fixes team switch 2017-11-06 15:14:17 +01:00
zmagod e17f945d8a fix typos 2017-11-02 16:41:29 +01:00
Luka Murn 329dd4f1b0 Onboard Flow onto validation components. 2017-10-30 14:13:36 +01:00
zmagod f76dc29e61 fix change user role [fixes SCI-1669] 2017-10-23 15:48:12 +02:00
zmagod 545cf50993 removes modalContaine, move leaveTeamModal under teams 2017-10-23 15:02:04 +02:00
zmagod 7cf43a299a adds flow in updateTeamDescriptionModal 2017-10-23 09:59:05 +02:00
zmagod 09e4e23e3d fixes typos 2017-10-19 15:48:21 +02:00
zmagod 92061628a0 adds @Ducz0r suggestions 2017-10-19 10:35:53 +02:00
zmagod 0a46d50e4b split custom types in multiple files 2017-10-18 16:14:45 +02:00
zmagod 5afd65d2b1 fixes active tab bug, opt-in flow [fixes SCI-1688] 2017-10-18 13:59:52 +02:00
zmagod 839eaf8e03 downgrade to react 15 since bootstrap-react is not fully compatible 2017-10-06 17:02:14 +02:00
zmagod e9568bcd47 optin flow in activities modal 2017-10-04 11:35:32 +02:00