2681 commits

Author	SHA1	Message	Date
Zanz2	a6009806c4	Fixed some oversights	2017-11-17 02:56:16 +01:00
Zanz2	fa25a6785b	Made the propper files and functionality for the text truncation to function	2017-11-17 02:43:32 +01:00
Zanz2	b2e1623cf1	Merge branch 'master' of https://github.com/biosistemika/scinote-web into validations_cutoff_SCI-1784	2017-11-16 20:04:12 +01:00
Zanz2	c44465817d	Added the functions and put in limitations from my validations files, changed controller name, added some locals	2017-11-16 20:03:44 +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
Zanz2	1b540a75a1	Fixed to use .megabytes	2017-11-16 15:17:13 +01:00
Zanz2	e782f13a7d	Merge branch 'master' of github.com:Zanz2/scinote-web into size_limit_small_SCI-1810	2017-11-16 15:14:01 +01:00
okriuchykhin	42f2d7e685	Merge pull request #883 from okriuchykhin/ok_SCI_1819 ... Allow import of the sample with missing non mandatory fields [SCI-1819]	2017-11-16 11:03:08 +01:00
mlorb	6c80c338e4	Merge pull request #880 from mlorb/ml-sci-1316 ... Change text for avatar size on my profile page [SCI-1316]	2017-11-16 10:43:23 +01:00
Zanz2	41c1193a78	Fixed unit error;Now when comparing file size, both are in bytes	2017-11-16 01:34:38 +01:00
Zanz2	4d65ad59fe	Merge pull request #878 from Zanz2/protocol_description_fix ... Found a bug; i forot to include protocol description in new preview modal	2017-11-16 01:11:52 +01:00
Oleksii Kriuchykhin	f202687291	Allow import of the sample with missing non mandatory fields [SCI-1819]	2017-11-15 16:40:14 +01:00
Oleksii Kriuchykhin	84f4aba213	Pull latest master into gilson-iot-rails4	2017-11-15 15:15:26 +01:00
Mojca Lorber	ff998a6c98	change text for avatar size on my profile page	2017-11-15 14:21:04 +01:00
mlorb	47784e09a8	Merge pull request #867 from mlorb/ml-sci-1434 ... Add explanation when copying custom repositories [SCI-1434]	2017-11-15 11:34:02 +01:00
mlorb	06fc0eac5e	Merge pull request #868 from mlorb/ml-sci-1215 ... Fix preview for images with transparent background [SCI-1215]	2017-11-15 11:28:57 +01:00
mlorb	288e3ddcbd	Merge pull request #877 from mlorb/ml-sci-1190 ... Fix bug when removing all keywords in protocol [SCI-1190]	2017-11-15 11:22:18 +01:00
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
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	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	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
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
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
Zanz2	a40a63ae50	Made code more aesthetic	2017-11-09 15:38:06 +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
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
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
zmagod	f43492adff	trigger an alert to on canvas save if page reload [fixes SCI-1610]	2017-11-07 15:08:26 +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	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	bd569b9746	small changes	2017-11-06 11:34:25 +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
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
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
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
Zanz2	6fc1afe4c1	Trying to fix this messy table preview	2017-10-30 01:57:42 +01:00
Zanz2	de9a3a1d0d	Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly	2017-10-28 23:57:29 +02:00
Zanz2	a167db11da	Scinote table elements code	2017-10-28 20:20:19 +02:00
Zanz2	c291caaae3	Debbuging preive hot tables	2017-10-28 16:59:36 +02:00
Zanz2	2413dc251a	Added new preview tables code	2017-10-28 02:19:22 +02:00
zmagod	e5a01f7a57	adds integration tests for about sciNote modal	2017-10-27 16:37:42 +02:00
okriuchykhin	2e0bf91467	Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675 ... Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2	2017-10-27 11:14:39 +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
Zanz2	a732c8afa7	Code for protocol repository scinote table elements view	2017-10-26 17:28:27 +02:00
zmagod	3d22a5404d	add scenic gem, teams datatables sql view	2017-10-26 16:59:00 +02:00
zmagod	d2ed415a25	Fixes per @okriuchykhin 's request	2017-10-26 10:42:18 +02:00
Zanz2	79e0a11054	Fixed before start and link not displaying in protocol description	2017-10-25 17:39:01 +02:00
Zanz2	a645bcb32d	fixed oversight;Changed double quote to single	2017-10-25 17:21:05 +02:00
zmagod	5e6a4bb69a	adds environment variable that disables/enables the creation of new team when user sign up	2017-10-25 15:29:04 +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
Zanz2	19b9da2e83	deleted comment	2017-10-24 19:44:34 +02:00
Zanz2	49501b3d3d	Finished review refactor	2017-10-24 19:24:53 +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
Zanz2	03e40017e4	Updated local	2017-10-19 19:58:18 +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
Zanz2	ae9ac46472	Put the two blocks of code into seperate partials	2017-10-19 00:13:35 +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
Zanz2	67b09adaeb	Fixed last few rubocop errors	2017-10-17 19:43:46 +02:00
Zanz2	6cf775a4b1	Refactored code, made html render on preview too	2017-10-17 19:27:20 +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	4e06b5c397	Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""	2017-10-17 13:17:49 +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
Zanz2	e72c1bebcb	deleted comments	2017-10-12 19:18:22 +02:00
Zanz2	8d0d6f0502	refactored methods	2017-10-12 19:10:16 +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
Zanz2	21036a1081	Deleted unnecesarry if's	2017-10-12 17:22:02 +02:00
Zanz2	414a15872c	Made seperate method for steps mapping	2017-10-12 17:15:43 +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
Zanz2	5d667f146e	Moved .js form reset and made a standalone description method	2017-10-11 17:59:09 +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
okriuchykhin	0d3cb3a129	Merge pull request #814 from okriuchykhin/ok_GIOT_55 ... Remove GIOT sign-in button [GIOT-55]	2017-10-10 17:04:34 +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
Oleksii Kriuchykhin	f8334b3d5b	Add editable field to task in tasks tree API call [GIOT-44]	2017-10-09 14:38:33 +02:00
mlorb	1049e0730e	implements @ZmagoD comments	2017-10-09 13:59:32 +02:00
Oleksii Kriuchykhin	bd26052110	Remove GIOT sign-in button [GIOT-55]	2017-10-09 11:56:46 +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
Zanz2	8720222ac2	Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper)	2017-10-07 22:45:01 +02:00
Zanz2	183c93d21b	Refactoring to git review specifications	2017-10-07 22:13:31 +02:00
Zanz2	9655c98566	Github review refactor	2017-10-07 20:47:05 +02:00
Zanz2	3a8092b663	Refactor and threw out useless comments	2017-10-07 18:05:09 +02:00
Zanz2	d52400f741	Refactored code according to review	2017-10-07 17:58:23 +02:00
Zanz2	2b9563ec6d	Added preview text to en.yml	2017-10-07 17:45:23 +02:00
Zanz2	f5b2ad0d34	Refactor github code review	2017-10-07 16:07:04 +02:00
Zanz2	66e5004e60	Changed import text to be inside en.yml, as said in the code review, deleted some blank lines	2017-10-07 15:56:43 +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
Zanz2	48f03d6dfb	hound blank line fix	2017-10-05 18:41:58 +02:00
Zanz2	fc1cd73e1d	fixed hound blank line	2017-10-05 18:38:44 +02:00
Zanz2	9fd67019e0	Deleted unused file	2017-10-05 18:09:07 +02:00
Zanz2	64b72f4ad4	Fixed a bug, where if the url get query is nil (if you go directly to /protocols, it doesnt get the public type from url, now when it is nil it just defaults to public	2017-10-05 17:31:49 +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
zmagod	a020e23286	follow suggestions of @Ducz0r	2017-10-05 13:56:56 +02:00
zmagod	754627efe7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564	2017-10-05 11:08:31 +02:00
zmagod	524e8bffbf	fixes sign out action on settings page, clean the redux store, handles redirect to sign in page if session is terminated [fixes SCI-1567]	2017-10-05 10:07:50 +02:00
mlorb	7db4bd1f5f	fix a few style error on All teams page	2017-10-05 10:05:55 +02:00
mlorb	91e2a6bab2	Merge pull request #787 from mlorb/ml-sci-1561 ... Fix bug with tinyMCE text validaton [SCI-1561]	2017-10-05 08:39:22 +02:00
okriuchykhin	2c5d913048	Merge pull request #804 from okriuchykhin/ok_SCI_1482 ... Improve memory utilization in PDF report generator [SCI-1482]	2017-10-04 17:51:28 +02:00
mlorb	fcea55c2a1	Merge pull request #808 from mlorb/ml-sci-1631 ... Fix rounded style of buttons and fix invite users to a team style errors [SCI-1631]	2017-10-04 14:57:45 +02:00
zmagod	14bae8def5	trigger redirect to root page on team switch [fixes SCI-1641]	2017-10-04 14:42:38 +02:00
zmagod	4380a65caf	fixes activities key [fixes SCI-1628]	2017-10-04 13:45:52 +02:00
zmagod	e9568bcd47	optin flow in activities modal	2017-10-04 11:35:32 +02:00
zmagod	84f279de22	setup flow	2017-10-04 09:16:17 +02:00
mlorb	83f06361f2	fix rounded style of buttons and fix invite users to a team style errors	2017-10-03 17:33:30 +02:00
zmagod	ce6613ac63	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629	2017-10-03 16:05:45 +02:00
zmagod	55332e2957	adds bootstrap and font-awesome in webpacker build fixes the missing icons bug [fixes SCI-1629]	2017-10-03 16:01:33 +02:00
Luka Murn	f8fc2737d5	Merge pull request #803 from Ducz0r/lm-sci-1599 ... Add global flash notifications/alerts [SCI-1599]	2017-10-03 11:15:27 +02:00
Luka Murn	2964579638	Fix Zmago's comments	2017-10-03 11:14:47 +02:00
Luka Murn	8ba7ed5884	Change the generation to be done using Redux (instead of this.window...)	2017-10-02 19:25:04 +02:00
zmagod	ef1025e0ee	fixes hound	2017-10-02 18:11:54 +02:00
zmagod	3dc3ed906f	fixes bug with embedded images [fixes SCI.1624]	2017-10-02 18:06:42 +02:00
zmagod	182e3dcc37	added colors constants	2017-10-02 14:56:49 +02:00
zmagod	edf4443995	added notification alert [fixes SCI-1566]	2017-10-02 14:51:54 +02:00
Oleksii Kriuchykhin	6824f9a8bc	Improve memory utulization in PDF report generator [SCI-1482]	2017-10-02 11:29:22 +02:00
Luka Murn	cbf2e3cc3f	Hound is love, Hound is life	2017-09-28 20:07:11 +02:00
Luka Murn	a0db8fcf9d	Some codestyle fixes	2017-09-28 19:49:25 +02:00
Luka Murn	6951755a92	Add animation, multiple alerts, make them float	2017-09-28 19:39:17 +02:00
zmagod	9de8592858	fixed edit image on hover action	2017-09-28 17:13:04 +02:00
zmagod	f492234f89	fixes hound allerts	2017-09-28 17:00:11 +02:00
zmagod	cb4bacc372	refactor preferences page [fixes SCI-1564]	2017-09-28 16:53:51 +02:00
zmagod	c8c8afdd1d	update react-bootstrap	2017-09-28 15:00:54 +02:00
mlorb	c358f8fa0c	write unit tests for invite users	2017-09-28 14:49:33 +02:00
Luka Murn	f6c7e854ad	Update main application, slight refactor	2017-09-27 17:59:04 +02:00
Luka Murn	a46f50af21	Remove FlashMessages component	2017-09-27 17:34:45 +02:00
Luka Murn	82d672293a	First WIP version of FlashMessages & Alert components	2017-09-27 17:29:04 +02:00
zmagod	26b526d61b	adds getter and setters for user settings	2017-09-27 14:38:52 +02:00
zmagod	66269d68ff	fixed image upload	2017-09-27 09:17:09 +02:00
zmagod	e2aa0d7515	fixes user profile	2017-09-26 17:29:11 +02:00
Zanz2	b23ca33e73	Deleted todo-list comments :D	2017-09-26 16:46:17 +02:00
Zanz2	c72cf6320a	Finished rubocop refactoring	2017-09-26 16:19:09 +02:00
Zanz2	3074acbc0d	Made javascript code nicer	2017-09-26 13:31:24 +02:00
Zanz2	055746bfd9	Rubocop beautified code v2	2017-09-26 13:21:48 +02:00
Zanz2	ad1847256c	Rubocop beautified code	2017-09-26 13:20:55 +02:00
Zanz2	8d961c934a	Rubocop refactored part of the controller code	2017-09-26 13:17:00 +02:00
Zanz2	2bfe8f0b95	Testing why rubocop gives errors	2017-09-25 15:27:24 +02:00
Zanz2	79e065a811	Fixed a mistake in the fix that made it not render the preview	2017-09-25 14:39:43 +02:00
Zanz2	292c1e3c31	Fixed bug, seems like unconssistent indexes instead of hash values can also happen in steps that arent first	2017-09-25 14:14:27 +02:00
Zanz2	11b2ef3112	Made code nicer, hopefully not unintentionally breaking something	2017-09-25 13:53:32 +02:00
Luka Murn	05e627e976	Fix missing value in delayed_uploader_tutorial ... Closes OPENSCI-26.	2017-09-22 17:10:53 +02:00
zmagod	1a7f8fc857	added frontend validations	2017-09-22 16:59:38 +02:00
Zanz2	549346bb0a	Deleted a warning that was out of place	2017-09-22 16:13:06 +02:00
Zanz2	dd4d4072e8	Made code more aesthetic	2017-09-22 16:02:56 +02:00
Zanz2	6ebdea5dce	Fixed old workaround with inconsistent protocols.io json formatting and made the workaround nicer (now its only one if statement, instead of one whole block of duplicated code)	2017-09-22 15:12:29 +02:00
Zanz2	4051c0b06b	Deleted old unused files i spotted on github	2017-09-22 13:28:38 +02:00
Zanz2	6a07aa28e4	Accidentally removed this line after reviewing git changes, adding it back	2017-09-22 13:11:49 +02:00
Zanz2	deef790951	added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions	2017-09-22 11:56:50 +02:00
mlorb	4ef7b57f31	fix error handeling	2017-09-22 09:57:41 +02:00
mlorb	9d96bf668a	fix error handeling, refactoring	2017-09-21 16:42:56 +02:00
Zanz2	1dbb03e22d	Added all the fields into description of protocol steps and protocol itself, need to make protocols description format nicer	2017-09-21 16:05:33 +02:00
Zanz2	df8cbc2741	vastly improved protocol preview styling to look more like documentation specifications	2017-09-21 13:46:52 +02:00
zmagod	39025769ec	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564	2017-09-21 13:45:27 +02:00
zmagod	ed2beefc08	fixed profile info inputs	2017-09-21 13:42:49 +02:00
mlorb	ac3601bd2e	hound	2017-09-21 10:56:17 +02:00
mlorb	55772a80ab	fix hound and refactor	2017-09-21 10:45:36 +02:00
mlorb	48c8922604	adds invite users modal	2017-09-21 10:45:35 +02:00
Zanz2	8da72eb64a	made code look nicer	2017-09-21 09:29:13 +02:00
Zanz2	f48833c47a	added format .js response which hides the preview modal and refreshes the page with protocolsDatatable.ajax.reload();	2017-09-21 08:40:05 +02:00
Luka Murn	e078ae4f77	Merge branch 'rails-5.1' into decoupling-settings-page	2017-09-21 08:36:09 +02:00
Luka Murn	beae1b05d8	Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock	2017-09-21 08:27:38 +02:00
Luka Murn	5429f6bbbd	Fix @ZmagoD's remarks	2017-09-21 08:06:11 +02:00
Zanz2	d59234a1e3	minor changes, working on refresh after submit	2017-09-20 16:04:52 +02:00
Zanz2	72c707ae88	protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit	2017-09-20 15:31:10 +02:00
zmagod	c636ca4276	refactor user preferences and profile page	2017-09-20 11:17:59 +02:00
Luka Murn	416ccf905d	Minor fix	2017-09-20 10:53:38 +02:00
Zanz2	7b85d74a23	added jquery code to reset file selector selected file after it is canceled in the preview modal	2017-09-20 09:32:31 +02:00
Zanz2	3812b2e64b	Removed on modal hide refresh, no longer needed, works without data gets updated without refresh since its not passed by javascript locals anymore	2017-09-20 08:58:00 +02:00
Zanz2	ea8f3e822d	Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone	2017-09-20 08:38:34 +02:00
Luka Murn	6e993f41b8	Indentation error	2017-09-19 16:59:19 +02:00
Luka Murn	869c3593a3	Hound is love, Hound is life	2017-09-19 16:56:39 +02:00
Luka Murn	decdce17fa	Fix rebasing problems	2017-09-19 16:47:55 +02:00
Luka Murn	44877a13a5	Refactor services on backend. New team page is now working	2017-09-19 16:32:21 +02:00
Luka Murn	80c05e50ec	Semi-working version of create new team form	2017-09-19 16:30:26 +02:00
Zanz2	ed64ce814a	i think i finally solved it, i found the issue being a certain file upload gem forcing textbox to .js files (remotipart), i tracked down their github issues and found a user that made a fix to this bug, copied his code ant it works, turns out it was a & symbol type escaped string breaking the javascript	2017-09-19 16:07:54 +02:00
Zanz2	7aba782639	optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show	2017-09-19 15:02:16 +02:00
Luka Murn	df44976fc6	Save input values into component state	2017-09-19 14:07:17 +02:00
Luka Murn	0108d9ea19	Finish new team GUI	2017-09-19 14:04:46 +02:00
Luka Murn	28cb9643d9	Blank new team page with breadcrumbs	2017-09-19 14:04:46 +02:00
zmagod	40af99c57f	fix hound v2	2017-09-19 13:36:51 +02:00
zmagod	8416ccc5c2	fixes hound alerts	2017-09-19 13:33:43 +02:00
zmagod	88928be2d3	fixes profile page route, moves source files out of packs folder, restructure React app architecture [fixes SCI-1622]	2017-09-19 13:08:08 +02:00
zmagod	015026926d	refactor	2017-09-18 15:46:24 +02:00
zmagod	f0a8275559	fixes merge conflicts	2017-09-18 15:36:33 +02:00
zmagod	b9492daa69	fixes changeTeam method	2017-09-18 15:16:07 +02:00
zmagod	d1477179b2	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1499	2017-09-18 15:10:52 +02:00
Toni Dezman	39c9b708bd	Merge pull request #780 from programmertoni/td_SCI_1565 ... Td sci 1565	2017-09-18 11:37:19 +02:00
zmagod	40359c5c73	fixed edit name modal	2017-09-15 16:34:05 +02:00
Zanz2	f861b1fc52	Configured the controller,the main task ahead is to figure out how to import all of the data i have available	2017-09-15 15:52:55 +02:00
zmagod	83647d81b4	adds edit team name modal	2017-09-15 14:00:48 +02:00
Zanz2	d85e02730d	Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc	2017-09-15 12:19:58 +02:00
Zanz2	175aa16a7d	Made submit form on preview, need to route it propperly, made text scroller for step importing that only works with my own sample protocol i created on protocols.io with every attribute set, trying to debug why it does this	2017-09-14 15:52:44 +02:00
Zanz2	5d6cc341ed	added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done	2017-09-14 14:42:04 +02:00
zmagod	1a00b53034	adds user_team tests	2017-09-14 13:11:19 +02:00
Toni Dezman	d38f4343f2	Decupling redux part 1	2017-09-14 11:46:49 +02:00
Zanz2	d6d1f9d490	changed second modal preview styling to fit its specifications	2017-09-14 11:46:41 +02:00
Zanz2	29b9d50363	Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer	2017-09-14 11:30:53 +02:00
zmagod	705d07f60e	adds remove team action	2017-09-13 17:11:51 +02:00
Zanz2	9fc91aac32	added protocols io upload preview modal	2017-09-13 16:04:16 +02:00
Zanz2	b7432b336a	added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller	2017-09-13 15:15:08 +02:00
zmagod	1b3b3dfea9	adds team members update role functionality	2017-09-12 17:30:13 +02:00
Žan Žagar	706031dacb	added model and controler, model should go to services while the controller should go to protocols controller	2017-09-12 15:25:22 +02:00
Žan Žagar	2a7a2b8fa1	Changed some minor button text and fixed a local error	2017-09-12 09:26:22 +02:00
Žan Žagar	62350d0d42	Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later	2017-09-11 16:03:33 +02:00
Žan Žagar	9b640c5df8	Dropdown menu works, need to add backend code for the second button	2017-09-11 15:28:48 +02:00
Žan Žagar	0f4dadefa9	prvi (star gumb) v dropdownu sedaj deluje	2017-09-11 15:23:09 +02:00
Žan Žagar	f668f60237	dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni	2017-09-11 15:22:22 +02:00
Žan Žagar	31e8c107fd	dodav na pravi branch te file	2017-09-11 14:35:00 +02:00
Toni Dezman	1cd9cd92fc	adds global spinner	2017-09-11 14:30:49 +02:00
Jure Grabnar	b4a13dffe3	init commit, dodav na protocols index gumb z dropdown	2017-09-11 13:07:22 +02:00
Mojca Lorber	a0f7030a70	fix bug with tinyMCE text validaton	2017-09-07 14:54:12 +02:00
Toni Dezman	67d617deb5	adds hound_bot's and zmagos suggestions	2017-09-07 13:40:53 +02:00
Mojca Lorber	0e14420193	fix bugs with importing samples	2017-09-06 14:41:14 +02:00
Toni Dezman	185039bc99	adds suggestions from code review	2017-09-04 15:00:26 +02:00
zmagod	9c01ab414c	refactor leave team	2017-09-01 17:10:43 +02:00
Oleksii Kriuchykhin	fc0e2d2172	Add validation for uid uniqness [GIOT-29]	2017-09-01 17:00:13 +02:00
Oleksii Kriuchykhin	a927c2832d	Improve error logging [GIOT-31]	2017-09-01 16:36:45 +02:00