3336 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
mlorb	b0fe792f9c	fix ESLint class-methods-use-this error	2017-11-09 13:33:41 +01:00
mlorb	c7f5d6ed8c	add state for number of teams per page	2017-11-09 13:29:14 +01:00
Zmago Devetak	7386974d64	Merge pull request #850 from ZmagoD/zd_SCI_1731 ... add scenic gem, teams datatables sql view	2017-11-09 11:37:20 +01:00
Zmago Devetak	26260d01fd	Merge pull request #856 from ZmagoD/zd_SCI_1610 ... trigger an alert to on canvas save if page reload [fixes SCI-1610]	2017-11-09 11:35:39 +01:00
Zanz2	518eb09110	Deleted un needed error flash	2017-11-09 10:49:44 +01:00
Zanz2	4b837dbe9d	Forgot flash fail messagges, now added them for file too big and general error	2017-11-09 10:49:44 +01:00
Zanz2	feb686b4ac	Fixed alignement	2017-11-09 10:49:44 +01:00
Zanz2	8b247770ef	Added the success flash alert	2017-11-09 10:49:44 +01:00
Zanz2	9086cd8b6b	Jira branch code	2017-11-09 10:49:44 +01:00
zmagod	e0b6683a44	create view directory per @Ducz0r 's request	2017-11-09 10:06:53 +01:00
mlorb	4e92065ea0	Merge pull request #855 from mlorb/ml-sci-1633-v2 ... Fix bug with import css styles [SCI-1633]	2017-11-09 09:49:37 +01:00
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
Zmago Devetak	a3245eecff	Merge pull request #851 from ZmagoD/zd_SCI_1568 ... adds integration tests for about sciNote modal	2017-11-09 09:01:00 +01:00
zmagod	f224629259	fixes failing team.feature:19 scenario	2017-11-09 09:00:00 +01:00
zmagod	e2af987b80	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568	2017-11-09 08:35:39 +01:00
zmagod	b3a8f8b5e2	refactor dev env	2017-11-08 17:31:21 +01:00
zmagod	e02f63276e	fix failing sign_up scenario	2017-11-08 17:22:03 +01:00
zmagod	33ebe1f748	integration tests for forgot_password [fixes SCI-1576]	2017-11-08 16:23:52 +01:00
zmagod	b036452d8c	adds background worker to cucumber tests	2017-11-08 11:59:01 +01:00
Luka Murn	ded8bd48c0	Merge branch 'Ducz0r-lm-add-flow-to-validation' into decoupling-settings-page	2017-11-08 09:33:47 +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	f7f825b11f	Move flow-typed & flow-bin back to devDependencies	2017-11-08 08:44:36 +01:00
Luka Murn	7cb159c1a3	Add updated flow-types	2017-11-07 17:31:12 +01:00
Luka Murn	0412c6f283	Update code per @ZmagoD's request	2017-11-07 17:30:15 +01:00
mlorb	157b1968cc	implement login's feature integration tests	2017-11-07 17:18:41 +01:00
zmagod	f43492adff	trigger an alert to on canvas save if page reload [fixes SCI-1610]	2017-11-07 15:08:26 +01:00
mlorb	9a875070c7	Merge pull request #854 from mlorb/ml-sci-1573 ... Implement single team feature Integration tests [SCI-1573]	2017-11-07 13:33:43 +01:00
Luka Murn	09ac0febbb	Bump version to 1.12.6	2017-11-07 12:48:53 +01:00
mlorb	428fa7f811	follow @ZmagoD's remarks	2017-11-07 11:29:37 +01:00
mlorb	df835fccb4	fix bug with import css styles	2017-11-07 11:09:30 +01:00
Zmago Devetak	a9bba07c74	Merge pull request #847 from ZmagoD/zd_SCI_1683 ... add whacamole configuration [fixes SCI-1683]	2017-11-06 15:56:29 +01:00
zmagod	3255d5cf7c	code cleanup	2017-11-06 15:37:09 +01:00
zmagod	54e360bb52	fixes team switch	2017-11-06 15:14:17 +01:00
mlorb	126f278308	Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json ... Scinote protocols IO base branch	2017-11-06 14:53:01 +01:00
mlorb	1c3c822796	change drivers for browser	2017-11-06 14:26:01 +01:00
mlorb	bd569b9746	small changes	2017-11-06 11:34:25 +01:00
Zanz2	04c6f0c20d	schema missing space	2017-11-03 21:50:06 +01:00
Zanz2	0dc0109d91	reverted schema	2017-11-03 21:47:52 +01:00
Zanz2	4354363215	rubocop refactor css	2017-11-03 16:46:03 +01:00
Zanz2	ac26b17ddf	Rubocop refactor	2017-11-03 16:45:15 +01:00
Zanz2	aa03a889c7	Fixed PR review	2017-11-03 16:28:15 +01:00
okriuchykhin	80405800ca	Merge pull request #818 from okriuchykhin/ok_SCI_1626 ... Enable :preserve_files in paperclip config [SCI-1626]	2017-11-03 11:56:57 +01:00
mlorb	21e3c653eb	add integration tests for single team feature	2017-11-03 10:48:09 +01:00
zmagod	55d05b013b	fix typo	2017-11-03 10:11:23 +01:00
zmagod	5bc38414d1	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731	2017-11-03 09:56:44 +01:00
Zmago Devetak	460bcd4980	Merge pull request #844 from ZmagoD/zd_SCI_1669 ... Refactor all API server calls from react to go through the services	2017-11-03 09:19:02 +01:00
Zanz2	096ee00e07	removed unnecessary html	2017-11-03 01:28:20 +01:00
Zanz2	6a4c38bbee	Fixed table elements render bugs, now renders after shown event	2017-11-03 01:04:50 +01:00
Zmago Devetak	b1f4d578f0	Merge pull request #848 from ZmagoD/zd_SCI_1726_add_team_member_bug_fix ... fixes user invitation button [fixes SCI-1726]	2017-11-02 16:50:42 +01:00
zmagod	618880aa30	follows @Ducz0r 's remarks	2017-11-02 16:49:09 +01:00