3418 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zanz2	c3f6c2b34a	Found a bug where i forot to include protocol description in preview modal and fixed it	2017-11-14 19:46:51 +01:00
Zanz2	bc00c4a28b	Merge pull request #874 from Zanz2/supported_file_1794 ... Made button green and added .json to supported file [SCI-1794]	2017-11-14 19:12:45 +01:00
Zanz2	9bd198eaf6	Merge pull request #875 from Zanz2/removed_txt_1793 ... Removed the .txt text from translations file [SCI-1793]	2017-11-14 19:12:32 +01:00
Zanz2	6cd2c6f518	Merge pull request #876 from Zanz2/valid_format_1791 ... Made validations for JSON format and .txt and .json files [SCI-1791]	2017-11-14 19:12:16 +01:00
Mojca Lorber	c2a5b52767	fix bug when removing all keywords in protocol	2017-11-14 15:04:37 +01:00
Zanz2	6b9a10ffe4	Made validations for JSON format and .txt and .json files	2017-11-14 12:02:17 +01:00
Zanz2	7ec8d7c2b2	Made button green and added .json to supported file	2017-11-14 11:46:19 +01:00
Zanz2	3e964da241	Removed the .txt text from translations file	2017-11-14 11:42:10 +01:00
Zanz2	8ba27f734e	Merge pull request #869 from Zanz2/Tables_and_protocol_info_integration ... Made the two seperate branches from previous jira issues work together (fixed a small bug)	2017-11-14 11:26:48 +01:00
Zanz2	f35ab78849	Added some code to make the two seperate jira issues work together (protocol info and scinote tables	2017-11-14 00:56:39 +01:00
Mojca Lorber	f75a2710d5	fix preview for images with transparent background	2017-11-13 18:03:14 +01:00
Mojca Lorber	be74338d9f	add explanation when copying custom repositories	2017-11-13 16:30:42 +01:00
Zmago Devetak	fe128dc53b	Merge pull request #865 from ZmagoD/zd_SCI_1761 ... fixes password validations [fixes SCI-1761]	2017-11-13 13:09:46 +01:00
mlorb	cd6799d571	Merge pull request #866 from biosistemika/protocols-io-import ... Protocols io import	2017-11-13 11:53:28 +01:00
Zanz2	b265beb386	Merge pull request #864 from Zanz2/move_desc ... Move protocol.io protocol description to step 1 of protocols [SCI-1695]	2017-11-13 10:07:01 +01:00
Zanz2	4750d6f270	Merge pull request #862 from Zanz2/move_tablev2 ... Protocols.io converted html tables to scinote table elements [SCI-1692]	2017-11-13 10:06:21 +01:00
Zanz2	23d3ffa5a4	Fixed PR	2017-11-12 15:48:45 +01:00
Zanz2	e26adc2905	Quick formatting fix	2017-11-12 15:41:50 +01:00
Zanz2	e7384ac38d	Code review fixes, made seperate helper file	2017-11-12 15:31:04 +01:00
mlorb	a982472e4a	Merge pull request #863 from mlorb/ml-sci-1728 ... Fix error with "event not defined" and add flowtype to ESLint [SCI-1728]	2017-11-10 14:33:39 +01:00
zmagod	26912a14d6	fixes password validations [fixes SCI-1761]	2017-11-10 12:59:37 +01:00
mlorb	fd743ec2d5	fix error with event not defined and add flowtype to ESLint	2017-11-10 09:30:55 +01:00
Zanz2	fa2c0fe556	merging	2017-11-09 18:55:17 +01:00
mlorb	dfb2689fbf	Merge pull request #860 from mlorb/ml-sci-1730 ... Fix team table does not retain the number of teams per page bug [SCI-1730]	2017-11-09 17:53:19 +01:00
Zanz2	812fa3f1d5	Hopefully this will resolve my merge problems	2017-11-09 17:42:17 +01:00
Zmago Devetak	9678d2a50d	Merge pull request #858 from ZmagoD/zd_SCI_1576 ... Implement Integration test: forgot password.feature	2017-11-09 16:12:49 +01:00
zmagod	327e27e123	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576	2017-11-09 15:55:10 +01:00
zmagod	16d4327010	rename sign_in_sign_up dir to sessions	2017-11-09 15:53:16 +01:00
Zanz2	a40a63ae50	Made code more aesthetic	2017-11-09 15:38:06 +01:00
Zanz2	60da9d136c	Merge pull request #859 from Zanz2/p_succ_msg_SCI-1694 ... Protocols.io import success flash messagge [SCI-1694]	2017-11-09 15:23:47 +01:00
mlorb	b3e39697d5	Merge pull request #857 from mlorb/ml-sci-1575 ... Implement login feature integration tests [SCI-1575]	2017-11-09 13:48:57 +01:00
mlorb	e227a75f5f	rename folder	2017-11-09 13:40:30 +01:00
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