2356 commits

Author	SHA1	Message	Date
okriuchykhin	9ed73702c5	Merge pull request #896 from okriuchykhin/ok_SCI_1837 ... Fix Ajax calls with redirect [SCI-1837]	2017-11-30 11:00:26 +01:00
Oleksii Kriuchykhin	194054d973	Fix assignment of users to projects [SCI-1838]	2017-11-29 22:55:10 +01:00
Oleksii Kriuchykhin	7bb52191cd	Fix Ajax calls with redirect [SCI-1837]	2017-11-29 16:13:28 +01:00
Oleksii Kriuchykhin	6964ed2dbb	Add initialization of the selectpicker on experiments actions [SCI-1840]	2017-11-28 16:34:30 +01:00
Luka Murn	00fe267a2a	Minor codestyle fixes	2017-11-23 11:33:39 +01:00
Luka Murn	d715eb06ef	Add team & project role-related helper functions to User model ... This will be required later once we start using Canaid.	2017-11-16 15:50:30 +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
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
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
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
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	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
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
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	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	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	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
mlorb	df835fccb4	fix bug with import css styles	2017-11-07 11:09:30 +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	bd569b9746	small changes	2017-11-06 11:34:25 +01:00
mlorb	21e3c653eb	add integration tests for single team feature	2017-11-03 10:48:09 +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
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
zmagod	e17f945d8a	fix typos	2017-11-02 16:41:29 +01:00
zmagod	5ded818291	fixes failing cucumber tests	2017-11-02 16:24:11 +01:00
zmagod	5538805faa	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1669	2017-11-02 14:39:07 +01:00
zmagod	2118b31762	adds about sciNote modal	2017-11-02 13:23:57 +01:00
Luka Murn	329dd4f1b0	Onboard Flow onto validation components.	2017-10-30 14:13:36 +01:00
zmagod	e5a01f7a57	adds integration tests for about sciNote modal	2017-10-27 16:37:42 +02:00
zmagod	3158fc4a8a	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1723	2017-10-27 10:47:10 +02:00
zmagod	e0323a0a46	fixes failing tests	2017-10-27 09:35:39 +02:00
zmagod	3d22a5404d	add scenic gem, teams datatables sql view	2017-10-26 16:59:00 +02:00
zmagod	c36fcb1fa4	fixes user invitation button [fixes SCI-1726]	2017-10-25 11:31:32 +02:00
Luka Murn	be2c3b807f	Merge pull request #845 from Ducz0r/lm-sci-1670 ... Input validation extracting to reusable service [SCI-1670]	2017-10-25 09:42:33 +02:00
zmagod	62dfd6a713	adds wait_for_ajax function to cucumber tests [fixes SCI-1723]	2017-10-24 15:39:06 +02:00
Luka Murn	a60e4c28bb	Hound is love, Hound is life	2017-10-24 13:58:59 +02:00
Luka Murn	cbe3e67402	Codestyle refactor	2017-10-24 13:57:33 +02:00
Luka Murn	0eea1e3def	Fixes per @ZmagoD's request	2017-10-24 13:49:33 +02:00
mlorb	324ecf1bb4	Merge pull request #843 from mlorb/ml-sci-1574 ... Add integration test for signup.feature [SCI-1574]	2017-10-24 10:05:28 +02:00
Luka Murn	998519066c	Remove unneeded localized Strings	2017-10-24 10:00:10 +02:00
Luka Murn	823ed75898	Add file validators, refactor a bit	2017-10-24 09:40:55 +02:00
Luka Murn	c026b60790	Update Profile page to use validation	2017-10-23 18:04:20 +02:00
Luka Murn	ceb11c143f	Change edit team name & description modals to use new validation	2017-10-23 17:55:28 +02:00
Luka Murn	463d17ace1	Add first version of reusable validation form elements ... Implemented on new team page.	2017-10-23 17:55:28 +02: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
Luka Murn	82f982e983	Merge branch 'rails-5.1' into decoupling-settings-page ... Conflicts: Gemfile Gemfile.lock	2017-10-23 10:59:10 +02:00
zmagod	7d6d95630d	add flow and fix api request in updateTeamNameModal component	2017-10-23 10:11:39 +02:00
zmagod	7cf43a299a	adds flow in updateTeamDescriptionModal	2017-10-23 09:59:05 +02:00
Luka Murn	6c2c5aff17	Additional fixes required by latest merge from master	2017-10-23 09:51:13 +02:00
Luka Murn	8254153bb9	Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock app/models/connection.rb app/models/experiment.rb app/models/my_module.rb	2017-10-23 08:57:57 +02:00
Zmago Devetak	a0eaec214b	Merge pull request #821 from ZmagoD/zd_SCI_1572 ... Implement integration test: profile.feature + initial setup	2017-10-20 20:17:37 +02:00
mlorb	550c5ad6f6	add integration test for signup.feature	2017-10-20 14:48:47 +02:00
okriuchykhin	44733fefda	Merge pull request #839 from okriuchykhin/ok_SCI_1609 ... Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]	2017-10-19 16:26:36 +02:00
zmagod	e3e3f4c75d	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688	2017-10-19 16:06:40 +02:00
Zmago Devetak	a677ef06c7	Merge pull request #837 from ZmagoD/zd_SCI_1703 ... adds page titles [fixes SCI-1703]	2017-10-19 15:50:16 +02:00
zmagod	09e4e23e3d	fixes typos	2017-10-19 15:48:21 +02:00
zmagod	7943bfda13	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688	2017-10-19 14:01:26 +02:00
zmagod	5e5d7ea2dd	fix page title locales	2017-10-19 12:50:33 +02:00
zmagod	fb0ba702e1	add HOC for page title	2017-10-19 12:37:17 +02:00
Oleksii Kriuchykhin	631b41cdaa	Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]	2017-10-19 11:38:23 +02:00
zmagod	92061628a0	adds @Ducz0r suggestions	2017-10-19 10:35:53 +02:00
zmagod	063ac4ea0b	increase polling interval [fixes SCI-1705]	2017-10-18 16:35:02 +02:00
zmagod	d324ea3c12	fixes flow error	2017-10-18 16:28:19 +02:00
zmagod	a6ea56540f	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688	2017-10-18 16:21:59 +02:00
zmagod	0a46d50e4b	split custom types in multiple files	2017-10-18 16:14:45 +02:00
Zmago Devetak	6702265b1e	Merge pull request #835 from ZmagoD/zd_SCI_1706 ... disables invite user button if no emails present [fixes SCI-1706]	2017-10-18 15:48:48 +02:00
zmagod	3558e20454	follow @Ducz0r suggestions	2017-10-18 15:37:13 +02:00
zmagod	2f68a90eff	adds page titles [fixes SCI-1703]	2017-10-18 15:23:46 +02:00
mlorb	a7ebaaed87	Merge pull request #824 from mlorb/ml-sci-1700 ... Fixes closing of notification modal window [SCI-1700]	2017-10-18 15:01:59 +02:00
zmagod	d2c3827289	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688	2017-10-18 14:15:28 +02:00
Zmago Devetak	10d5b573ee	Merge pull request #834 from ZmagoD/zd_SCI_1684 ... fixes accept invitation bug [fixes SCI-1684]	2017-10-18 14:10:08 +02:00
Zmago Devetak	fd755eedf0	Merge pull request #832 from ZmagoD/zd_SCI_1560 ... adds label under protocols keywords input [fixes SCI-1560]	2017-10-18 14:06:13 +02:00
zmagod	5afd65d2b1	fixes active tab bug, opt-in flow [fixes SCI-1688]	2017-10-18 13:59:52 +02:00
mlorb	5e9a1408f2	fix banana bug	2017-10-18 13:41:58 +02:00
zmagod	6a5bafd07b	fix hound	2017-10-18 08:42:48 +02:00
zmagod	3179a7abf5	disables invite user button if no emails present [fixes SCI-1706]	2017-10-18 08:37:58 +02:00
okriuchykhin	8e90e041b9	Merge pull request #825 from okriuchykhin/ok_SCI_1665 ... Optimize memory usage in samples/repositories import [SCI-1665]	2017-10-17 17:26:00 +02:00
zmagod	c554bc5c18	fixes accept invitation bug [fixes SCI-1684]	2017-10-17 16:00:26 +02:00
mlorb	6c6aa53904	add new team to redux	2017-10-17 15:52:18 +02:00
Oleksii Kriuchykhin	cd0aba1896	Change any? to empty? [SCI-1665]	2017-10-17 15:23:54 +02:00
Oleksii Kriuchykhin	c8d2ae70fa	Move duplicated code to service [SCI-1665]	2017-10-17 14:46:16 +02:00
zmagod	30d091dc65	adds label under protocols keywords input [fixes SCI-1560]	2017-10-17 14:10:56 +02:00
mlorb	a4a2c79959	Merge pull request #829 from mlorb/ml-sci-1691 ... Fixes some text style and default input values [SCI-1691]	2017-10-17 13:45:07 +02:00
mlorb	67585a4c6e	Merge pull request #827 from mlorb/ml-sci-1702 ... Add search to one team page [SCI-1702]	2017-10-17 13:43:01 +02:00
mlorb	1a15c5fa4f	Merge pull request #823 from mlorb/ml-sci-1636-v2 ... Removes focus from "add team members" button after… [SCI-1636]	2017-10-17 13:28:35 +02:00
mlorb	7f3c34b930	Merge pull request #822 from mlorb/ml-sci-1633 ... Fixes time zone style [SCI-1633]	2017-10-17 13:21:02 +02:00
Luka Murn	4d8f2665d3	Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"	2017-10-17 13:10:02 +02:00
mlorb	21b13f0e2c	fixes some text style and default input values	2017-10-17 10:57:14 +02:00
zmagod	952c4e8195	fixes bug with remove user modal [fixes SCI-1699]	2017-10-17 09:55:04 +02:00
zmagod	6fe48a07ae	fix hound, add custom hook for webpacker:compile	2017-10-16 17:02:35 +02:00
zmagod	c5978f2d86	adds cucumber test for profile page [fixes SCI-1572]	2017-10-16 16:21:52 +02:00
okriuchykhin	66e9e60c9d	Merge pull request #826 from okriuchykhin/ok_SCI_1689 ... Use case insensitive sample types and groups in import [SCI-1689]	2017-10-16 13:32:04 +02:00
mlorb	b92fd6be35	add search to one team page	2017-10-16 13:10:46 +02:00
Luka Murn	2fb2b90da3	Merge pull request #820 from Ducz0r/lm-sci-1675 ... Add Add-ons page to User -> Settings -> Account [SCI-1675]	2017-10-16 13:05:43 +02:00
Oleksii Kriuchykhin	d266034406	Use case insensitive sample types and groups in import [SCI-1689]	2017-10-13 17:15:51 +02:00
mlorb	dafa4a6f1f	fixes closing of notification modal window	2017-10-13 10:46:58 +02:00
okriuchykhin	db9a031581	Merge pull request #813 from okriuchykhin/ok_SCI_1642 ... Refactor canvas [SCI-1642]	2017-10-12 17:45:34 +02:00
zmagod	bdc1051cbb	cleanup	2017-10-12 17:05:04 +02:00
zmagod	e5ebedb428	fix errors with polyfill	2017-10-12 16:49:33 +02:00
gazvoda	88f03a0706	Merge pull request #735 from gazvoda/lg-SCI-1249-v2 ... Truncate checklist items in activity modal [fixes SCI-1249]	2017-10-12 15:58:05 +02:00
mlorb	f19c0defd6	remove focus from add team members button after the invite users modal closes	2017-10-12 15:28:00 +02:00
mlorb	ed80d849aa	remove double css file import and move data-tables style to the component	2017-10-12 14:54:40 +02:00
mlorb	6cc3c2df95	fixes time zone styling	2017-10-12 14:45:08 +02:00
Oleksii Kriuchykhin	56f52ebfa7	Optimize memory usage in samples/repositories import [SCI-1665]	2017-10-12 14:43:25 +02:00
zmagod	dccf4e34ff	fix cucumber settings	2017-10-12 13:50:48 +02:00
Oleksii Kriuchykhin	9a8e33c6d7	Small fixes [SCI-1642]	2017-10-11 17:24:31 +02:00
zmagod	3740e89ca0	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1572	2017-10-11 15:20:09 +02:00
zmagod	abe0b8adcc	tweak tweak	2017-10-11 15:20:03 +02:00
Luka Murn	fe89b942e7	Add Add-ons page to User -> Settings -> Account ... Closes SCI-1675.	2017-10-11 14:15:37 +02:00
zmagod	f71ff8589d	changes testing image	2017-10-11 09:51:20 +02:00
mlorb	8bd698e5c3	Merge pull request #817 from mlorb/ml-sci-1632 ... Fixes buttons on my profile page [SCI-1632]	2017-10-10 16:30:50 +02:00
mlorb	7ca29b50a2	Merge pull request #816 from mlorb/ml-sci-1636 ... Fixes style errors on one team page [SCI-1636]	2017-10-10 16:23:50 +02:00
Zmago Devetak	e99791bd29	Merge pull request #819 from ZmagoD/fix_webpacker_production_configuration ... fixes webpack production build	2017-10-10 15:08:28 +02:00
zmagod	f12a645fa3	fix hound	2017-10-10 15:01:25 +02:00
zmagod	f00c36998d	removes unneeded style component	2017-10-10 14:51:46 +02:00
zmagod	a35ba0239a	fixes flow types	2017-10-10 14:48:46 +02:00
Zmago Devetak	d1c3d00c84	Merge pull request #807 from ZmagoD/zd_SCI_1629 ... adds bootstrap and font-awesome in webpacker build fixes the missing …	2017-10-10 14:09:52 +02:00
zmagod	c014742a88	fixes webpack production build	2017-10-10 14:08:23 +02:00
mlorb	fd859d7b7f	fixes buttons on my profile page	2017-10-10 13:25:44 +02:00
mlorb	7dae772822	fixes style errors on one team page	2017-10-10 11:32:13 +02:00
mlorb	25e6eb4511	Merge pull request #812 from mlorb/ml-sci-1634 ... Fix a few style error on All teams page [SCI-1634]	2017-10-09 14:59:57 +02:00
mlorb	1049e0730e	implements @ZmagoD comments	2017-10-09 13:59:32 +02:00
zmagod	fc585ebe11	refactor GlobalActivitiesModal constructor	2017-10-09 10:58:40 +02:00
zmagod	943339345a	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628	2017-10-09 10:41:36 +02:00
zmagod	2d1c849106	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629	2017-10-09 09:43:29 +02:00
zmagod	d85233cb2c	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566	2017-10-09 09:30:06 +02:00
zmagod	0a8ef8cd9d	removed unneeded import	2017-10-09 09:23:25 +02:00
zmagod	2a64d23a6e	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1567	2017-10-09 09:14:58 +02:00
lenart	de3c18509f	Variable name changes, added comments to code [fixes SCI-1249]	2017-10-06 17:12:15 +02:00
zmagod	811b206392	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1641	2017-10-06 17:05:07 +02:00
zmagod	839eaf8e03	downgrade to react 15 since bootstrap-react is not fully compatible	2017-10-06 17:02:14 +02:00
zmagod	3321fc495c	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628	2017-10-06 15:54:52 +02:00
zmagod	8dfb5e2260	implements @mlorb suggestions	2017-10-06 15:22:01 +02:00
Oleksii Kriuchykhin	6820511ea0	Further canvas optimizations [SCI-1642]	2017-10-06 12:43:27 +02:00
zmagod	c3562e08e9	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566	2017-10-06 10:46:47 +02:00
zmagod	5a31df7204	adds @Ducz0r suggestions	2017-10-06 10:45:22 +02:00
zmagod	dea69014d0	fixes bug with password confirmation	2017-10-06 09:54:17 +02:00
Oleksii Kriuchykhin	b26b963e54	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
zmagod	c20f0c2d8a	fixes user_controller specs, adds user model specs for settings	2017-10-05 15:53:05 +02:00