1031 commits

Author	SHA1	Message	Date
mlorb	70ae14a9b8	refactor manage repository permissions again because of addons	2018-01-05 11:17:01 +01:00
mlorb	ec851caa80	refactor manage repository column permissions again because of addons	2018-01-05 10:43:59 +01:00
zmagod	862b73cae7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866	2018-01-05 09:13:43 +01:00
okriuchykhin	4cdbecc3bc	Merge pull request #923 from okriuchykhin/ok_SCI_1869 ... Add project/task path with tooltips to activities [SCI-1869]	2018-01-04 16:44:35 +01:00
okriuchykhin	b0f8c36677	Merge pull request #917 from okriuchykhin/ok_SCI_1870 ... Fix adding users to a task [SCI-1870]	2018-01-04 14:14:05 +01:00
mlorb	abced181d5	refactor manage repository rows permissions again because of addons	2018-01-04 11:53:58 +01:00
mlorb	0c519b8f03	refactor manage sample elements permissions again because of addons	2018-01-03 16:37:02 +01:00
okriuchykhin	ff62a36788	Merge pull request #910 from okriuchykhin/ok_SCI_1838 ... Change invite users to project link to new settings page [SCI-1838]	2018-01-03 14:47:26 +01:00
okriuchykhin	b8fa3c4d51	Merge pull request #905 from okriuchykhin/ok_SCI_1865 ... Add icons for different notification types in recent notification dropdown [SCI-1865]	2018-01-03 14:23:53 +01:00
zmagod	1d3881b649	fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]	2018-01-03 13:48:59 +01:00
Oleksii Kriuchykhin	2e275d6d67	Add project/task path with tooltips to activities [SCI-1869]	2017-12-28 15:13:39 +01:00
Zanz2	83e1b04c7a	Fixed pull request	2017-12-24 01:49:04 +01:00
Oleksii Kriuchykhin	917c2cf28e	Fix experiment workflow image update indicator [SCI-1872]	2017-12-22 13:12:52 +01:00
mlorb	0774b6f7e6	refactor manage samples permissions again, so that addons permissions can be added	2017-12-20 16:05:05 +01:00
Oleksii Kriuchykhin	49ae9bcd55	Fix adding users to a task [SCI-1870]	2017-12-20 13:44:21 +01:00
Luka Murn	cf291bf887	Merge branch 'gilson-iot-rails4' ... Conflicts: Gemfile.lock	2017-12-19 10:56:39 +01:00
Zanz2	53561ffd84	Refactored according to PR	2017-12-15 20:39:15 +01:00
mlorb	7c1ae6bc82	refactor manage repository permissions	2017-12-14 14:18:18 +01:00
mlorb	2918a9833d	refactor manage repository column permissions	2017-12-14 14:18:18 +01:00
mlorb	3f5e9e60b7	refactor view repository permission	2017-12-14 14:18:18 +01:00
mlorb	079ac7a4d3	refactor manage repository row permissions	2017-12-14 14:18:18 +01:00
mlorb	740ecc674b	refactor view repositories permission	2017-12-14 14:18:18 +01:00
mlorb	3ca51f097f	refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions	2017-12-14 14:18:17 +01:00
mlorb	72023c7dfe	refactor update/delete sample permissions	2017-12-14 14:18:17 +01:00
mlorb	f801ed8eb6	refactor view/export samples permission	2017-12-14 14:18:16 +01:00
mlorb	806fcbce36	refactor update protocol in repository permission	2017-12-14 14:18:16 +01:00
mlorb	e0d1ae174e	refactor read protocol in repository permission	2017-12-14 14:18:15 +01:00
mlorb	ccc2451494	refactor create sample permissions	2017-12-14 14:18:15 +01:00
mlorb	43c01b74b1	refactor create protocol permission	2017-12-14 14:18:14 +01:00
mlorb	a0b2d3f5ef	refactor read_team permission	2017-12-14 14:18:14 +01:00
zmagod	219ef3baf6	setup new pagination for activities	2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin	4ff6e87fed	Change invite users to project link to new settings page [SCI-1838]	2017-12-14 11:22:28 +01:00
Oleksii Kriuchykhin	6986d11cfe	Add Flow types for notifications [SCI-1865]	2017-12-13 17:25:25 +01:00
zmagod	249d3d7698	fixes current timezone setup for activities	2017-12-13 16:48:31 +01:00
okriuchykhin	2fa7591f36	Merge pull request #903 from okriuchykhin/ok_SCI_1864 ... Rename notifications settings accessor [SCI-1864]	2017-12-13 12:57:56 +01:00
Oleksii Kriuchykhin	baf3151bb0	Fix notification settings accessors [SCI-1864]	2017-12-13 11:59:53 +01:00
Oleksii Kriuchykhin	ea63864b33	Add icons for different notification types in recent notification dropdown [SCI-1865]	2017-12-12 17:05:08 +01:00
Zmago Devetak	00be4460cc	Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step ... Fixes bug with embedded images [SCI-1624]	2017-12-12 09:53:24 +01:00
Zanz2	11dc3be9d4	It is now possible to scroll down preview modal	2017-12-10 01:41:21 +01:00
Zanz2	d0a9198408	Fixed the styling	2017-12-10 01:20:08 +01:00
Oleksii Kriuchykhin	6256acdfea	Rename notifications settings accessor [SCI-1864]	2017-12-07 13:59:33 +01:00
Luka Murn	86ac07c69f	Merge pull request #902 from biosistemika/rails-5.1 ... Merge rails-5.1 into decoupling-settings-page	2017-12-07 09:25:11 +01:00
okriuchykhin	b3b0e367e8	Merge pull request #889 from okriuchykhin/ok_SCI_1747 ... Improve server side assets validation display for steps [SCI-1747]	2017-12-04 14:12:43 +01:00
Zanz2	fcbd956d6e	Finished code beautification	2017-12-03 01:17:49 +01:00
Zanz2	835ac6910f	Code refactor part 1	2017-12-02 00:29:47 +01:00
Oleksii Kriuchykhin	c4fe2b1c11	Fix jsPlumb library loading [SCI-1839]	2017-12-01 10:48:07 +01:00
zmagod	7442684846	fix protocol preview, remove unneeded functions, fix copy paste tokens	2017-11-28 14:16:20 +01:00
Zanz2	bb8aef3b73	Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833 ... Fixed validations lengths and added workarounds for bugs [SCI-1833]	2017-11-24 17:55:20 +01:00
zmagod	066c782cd2	Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step	2017-11-24 16:29:32 +01:00
Zmago Devetak	027f4a5921	Merge pull request #890 from ZmagoD/zd_SCI_1651 ... export and import RTE images	2017-11-24 16:28:28 +01:00
zmagod	d200e355ed	follow @Ducz0r 's suggestions	2017-11-24 11:45:07 +01:00
Zanz2	dc5904aed9	Fixed this jira issue and added workarounds for bugs	2017-11-24 01:45:40 +01:00
Zanz2	764e5259d1	Fixed last review, and a bug i found	2017-11-22 23:38:22 +01:00
zmagod	afbeafb137	adds RTE images import, disables turbolinks on edit step actions	2017-11-22 16:28:14 +01:00
Zanz2	f577bf93b5	Fixed pull request review	2017-11-21 19:20:15 +01:00
Oleksii Kriuchykhin	fe8b7d26c1	Improve server side assets validation display for steps [SCI-1747]	2017-11-21 13:48:06 +01:00
Zanz2	d8c809ffd0	Reviewed pull request	2017-11-20 23:19:34 +01:00
Zanz2	cf66d94d45	Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields	2017-11-20 00:59:32 +01:00
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	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
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	84f4aba213	Pull latest master into gilson-iot-rails4	2017-11-15 15:15:26 +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
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	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
Mojca Lorber	be74338d9f	add explanation when copying custom repositories	2017-11-13 16:30:42 +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	fa2c0fe556	merging	2017-11-09 18:55:17 +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
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	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
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
Zanz2	aa03a889c7	Fixed PR review	2017-11-03 16:28:15 +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
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
zmagod	e17f945d8a	fix typos	2017-11-02 16:41:29 +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
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
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
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
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