2640 commits

Author	SHA1	Message	Date
okriuchykhin	1692bdade7	Merge pull request #941 from okriuchykhin/ok_SCI_1945 ... Fix repository item export [SCI-1945]	2018-01-17 12:50:22 +01:00
okriuchykhin	2c2914f691	Merge pull request #942 from okriuchykhin/ok_SCI_1940 ... Fix task repository row selector [SCI-1940]	2018-01-17 12:50:11 +01:00
zmagod	0922ee21a7	fixes first element in global activities logs[fixes SCI-1866]	2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin	74a62c41eb	Fix task repository row selector [SCI-1940]	2018-01-17 11:21:41 +01:00
Oleksii Kriuchykhin	86853e8fc1	Fix repository item export [SCI-1945]	2018-01-17 10:39:01 +01:00
Oleksii Kriuchykhin	3c8d8e2fbb	Fix samples import [SCI-1946]	2018-01-16 17:50:33 +01:00
Adrian Oprea	d71f6161e4	feat(Navigation): Enhance navigation with addons ... Use the withExtras HOC to add external functionality without embedding that knowledge in the core.	2018-01-16 17:24:11 +02:00
Adrian Oprea	d7b63f5941	feat(massageConfiguration): Add data-transformation function ... The meta-configuration structure imposes we change the way `react-hijack` parses and pulls its data. Because that work is both error-prone and also time-consuming, we chose to implement a function that would "massage" the data so it fits the current way react-hijack expects it.	2018-01-16 17:23:15 +02:00
Adrian Oprea	583efbc9c4	refactor(componentLoader): Add component path at module level ... Instead of forcing this knowledge on the add-on, we inserted it here. The benefit is that we are able to point the core to whatever directory we choose, without modifying each addon in turn.	2018-01-16 17:19:56 +02:00
Adrian Oprea	350862b0cc	feat: Re-export availableAddons ... This will probably be removed and the config will be exported through the main entrypoint.	2018-01-16 17:18:46 +02:00
Adrian Oprea	f6f2bc4c3d	feat: Create availableAddons empty config ... This configuration is populated on build-time with the available extras which expose a `client/` directory containing React code.	2018-01-16 17:17:39 +02:00
zmagod	a931a1bc15	adds first date to _list.html.erb view	2018-01-16 14:03:22 +01:00
Oleksii Kriuchykhin	b59815c611	Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]	2018-01-16 11:11:50 +01:00
Adrian Oprea	894e0afd0a	feat(componentLoader): Add external component loader module ... For render hijacking to work, imports need to be peformed at core level. This loader ensures that Webpack is able to resolve the paths to the external components' code, without the need for extra loaders or custom built plugins. Signed-off-by: Adrian Oprea <adrian@oprea.rocks>	2018-01-16 10:14:35 +02:00
Oleksii Kriuchykhin	a64012237e	Fix repository records import [SCI-1939]	2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin	79e1eaf145	Fix export samples button [SCI-1936]	2018-01-15 13:54:08 +01:00
Oleksii Kriuchykhin	deabd39a98	Fix protocol import button [SCI-1931]	2018-01-15 13:43:09 +01:00
okriuchykhin	00927be287	Merge pull request #932 from okriuchykhin/ok_SCI_1915 ... Improve XLSX parsing with Roo [SCI-1915]	2018-01-12 14:57:17 +01:00
Zmago Devetak	ebd354e4d5	Merge pull request #900 from ZmagoD/zd_SCI_1854 ... adds premissions service to FE	2018-01-12 14:24:28 +01:00
Zanz2	b105920d4e	Merge pull request #901 from Zanz2/code_refactor ... Protocols.io code beautification and refactoring [SCI-1929]	2018-01-12 12:34:00 +01:00
zmagod	371491c259	refactor	2018-01-12 11:38:52 +01:00
Zanz2	3c6d37ce64	Fixed according to PR review	2018-01-11 18:37:36 +01:00
Oleksii Kriuchykhin	2ddb0ea009	Improve XLSX parsing with Roo [SCI-1915]	2018-01-11 17:52:57 +01:00
mlorb	aba426091c	add render 403 for create team permission	2018-01-10 10:47:45 +01:00
mlorb	6c4514f550	add create_teams permission checks	2018-01-09 15:28:27 +01:00
zmagod	0d7c116de1	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854	2018-01-09 10:03:02 +01:00
zmagod	c5379896c0	fix HOC to recive objects	2018-01-08 16:28:20 +01:00
Zmago Devetak	4e4cae9a48	Merge pull request #927 from ZmagoD/zd_SCI_1867 ... fix import protocol preview [fixes SCI-1867]	2018-01-08 14:21:44 +01:00
Zmago Devetak	0e6931b1f3	Merge pull request #908 from ZmagoD/zd_SCI_1866 ... Wrong date at activity	2018-01-08 14:20:26 +01:00
zmagod	c07f54a0c7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854	2018-01-08 08:38:14 +01:00
zmagod	7af4816ce8	removes js brakepoint	2018-01-05 17:13:39 +01:00
zmagod	455534ef9a	fixes list keys	2018-01-05 17:11:38 +01:00
zmagod	eb8124ea5a	follow @duco 's suggestions	2018-01-05 17:08:00 +01:00
mlorb	fd6dfbd561	rename create_teams	2018-01-05 16:47:48 +01:00
mlorb	e76ec7f4a4	Merge pull request #911 from mlorb/ml-sci-1797 ... Permissions - refactor organization & team level permissions (core) [SCI-1797]	2018-01-05 16:03:55 +01:00
mlorb	efb4ce289c	fix and/or use	2018-01-05 15:52:41 +01:00
zmagod	3fae267547	fix import protocol preview [fixes SCI-1867]	2018-01-05 15:30:11 +01:00
mlorb	99185871c4	fix naming things	2018-01-05 15:15:50 +01:00
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	be014000ab	fixes flow-types	2018-01-05 09:59:08 +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
zmagod	0d72851bb5	fixes bug with displaying assign/unassign button [fixes SCI-1870]	2018-01-04 17:20:17 +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
Oleksii Kriuchykhin	53f4db9352	Code refactoring [SCI-1869]	2018-01-04 14:56:16 +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
okriuchykhin	e49ffb61d4	Merge pull request #914 from okriuchykhin/ok_SCI_1873 ... Fix repositories [SCI-1873]	2018-01-04 13:33:30 +01:00
mlorb	abced181d5	refactor manage repository rows permissions again because of addons	2018-01-04 11:53:58 +01:00
Oleksii Kriuchykhin	070711917e	Code fixes [SCI-1873]	2018-01-04 11:25:34 +01:00
zmagod	e0e3ef9359	fixes flow, and before_action in permissions_controller	2018-01-03 17:23:50 +01:00
okriuchykhin	d149facd50	Merge pull request #922 from okriuchykhin/ok_SCI_1875 ... Fix about modal [SCI-1875]	2018-01-03 17:00:29 +01:00
mlorb	0c519b8f03	refactor manage sample elements permissions again because of addons	2018-01-03 16:37:02 +01:00
okriuchykhin	3d3b1d3a44	Merge pull request #921 from okriuchykhin/ok_SCI_1648 ... Fix assign repository record button in tasks when one record is selected [SCI-1648]	2018-01-03 16:28:34 +01:00
okriuchykhin	ac7746ae91	Merge pull request #916 from okriuchykhin/ok_SCI_1871 ... Fix canvas update [SCI-1871]	2018-01-03 15:47:10 +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
mlorb	dc68b3068b	fix Rails 5.1 bug with params	2018-01-03 13:19:56 +01:00
Oleksii Kriuchykhin	2e275d6d67	Add project/task path with tooltips to activities [SCI-1869]	2017-12-28 15:13:39 +01:00
Zanz2	7bad722553	Made small oversight and fixed it	2017-12-24 02:06:14 +01:00
Zanz2	83e1b04c7a	Fixed pull request	2017-12-24 01:49:04 +01:00
Oleksii Kriuchykhin	89230bd730	Fix about modal [SCI-1875]	2017-12-22 18:27:20 +01:00
Oleksii Kriuchykhin	27008be50e	Fix assign repository record button in tasks when one record is selected [SCI-1648]	2017-12-22 18:05:22 +01:00
okriuchykhin	0a6d0d1a47	Merge pull request #918 from okriuchykhin/ok_SCI_1893 ... Fix invite users dropdown [SCI-1893]	2017-12-22 16:58:49 +01:00
Oleksii Kriuchykhin	917c2cf28e	Fix experiment workflow image update indicator [SCI-1872]	2017-12-22 13:12:52 +01:00
Oleksii Kriuchykhin	afb579bef1	Fix invite users dropdown [SCI-1893]	2017-12-21 16:49:10 +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
Oleksii Kriuchykhin	66869fe4cf	Fix canvas update [SCI-1871]	2017-12-20 11:44:11 +01:00
Oleksii Kriuchykhin	512ee07bde	Fix repositories [SCI-1873]	2017-12-19 17:53:45 +01:00
Oleksii Kriuchykhin	1a81a99ff0	Remove Creek XLSX parser gem as it causes conflicts [SCI-1891]	2017-12-19 16:17:11 +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	bd7eda1506	fix failing tests	2017-12-14 14:18:18 +01:00
mlorb	2936770c01	refactor can view team users ATWHO permission	2017-12-14 14:18:18 +01:00
mlorb	5c790287ec	refactor again manage user team permissions	2017-12-14 14:18:18 +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	e577b363b2	byTheWay fix of Rails 5.1 bug	2017-12-14 14:18:17 +01:00
mlorb	29f9414839	refactor create project permission	2017-12-14 14:18:17 +01:00
mlorb	72023c7dfe	refactor update/delete sample permissions	2017-12-14 14:18:17 +01:00
mlorb	b09377cd8d	refactor update sample permission	2017-12-14 14:18:17 +01:00
mlorb	f801ed8eb6	refactor view/export samples permission	2017-12-14 14:18:16 +01:00
mlorb	0d37f9c85a	refactor clone protocol permission	2017-12-14 14:18:16 +01:00
mlorb	f6d36ae6a2	refactor update protocol type in repository	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	a3a494c3a2	fix banana: remove dead code which strangely reappeared, probably with some rebasing	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	11a3cd196c	add create, update team permission and refactor 422 respond handling in controllers	2017-12-14 14:18:14 +01:00
mlorb	8893fd668d	add create, update, delete user_team 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	7bdc22ee80	Remove default property [SCI-1865]	2017-12-13 17:28:05 +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
zmagod	b106545d31	fixes per @duco 's request	2017-12-13 08:57:50 +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	1fc8b2a2b2	quick fix un-needed styling	2017-12-10 01:45:47 +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
zmagod	52e5cf7be8	remove unneeded import	2017-12-04 13:27:24 +01:00
zmagod	e01e7bebbf	add permissions endpoint on the API	2017-12-04 13:25:48 +01:00
Zanz2	b0012ab936	Simplified repeating method calls	2017-12-03 16:50:06 +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
Zmago Devetak	205d3b3d8f	Merge pull request #894 from ZmagoD/zd_SCI_1650 ... Adds task to copy images [fixes SCI-1650]	2017-12-01 17:32:09 +01:00
zmagod	b6a5ab5e6c	fix request	2017-12-01 17:29:46 +01:00
zmagod	52b278fe78	adds premissions service to FE	2017-12-01 17:15:15 +01:00
Oleksii Kriuchykhin	373d7e8aa6	Clear selected files after successful upload [SCI-1747]	2017-12-01 11:51:22 +01:00
Oleksii Kriuchykhin	c4fe2b1c11	Fix jsPlumb library loading [SCI-1839]	2017-12-01 10:48:07 +01:00
okriuchykhin	16729ccd7d	Merge pull request #898 from okriuchykhin/ok_SCI_1838 ... Fix assignment of users to projects [SCI-1838]	2017-11-30 11:16:07 +01:00
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	745dac09a7	Improve clean-up of dropped files [SCI-1747]	2017-11-28 16:48:47 +01:00
Oleksii Kriuchykhin	6964ed2dbb	Add initialization of the selectpicker on experiments actions [SCI-1840]	2017-11-28 16:34:30 +01:00
zmagod	7442684846	fix protocol preview, remove unneeded functions, fix copy paste tokens	2017-11-28 14:16:20 +01:00
Oleksii Kriuchykhin	e35031dd9a	Small code fixies [SCI-1747]	2017-11-28 11:34:57 +01:00
zmagod	e233fbe1d8	fix image removing from tinymce	2017-11-28 11:01:07 +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	e69e9f6794	remove unneeded comment and add tiny_mce_asset regex in a constant	2017-11-24 17:04:01 +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
Zmago Devetak	728f656472	update protocols_exporter.rb	2017-11-24 15:23:19 +01:00
Zmago Devetak	3cd7e6fdde	fix open method	2017-11-24 15:19:58 +01:00
Zanz2	0e574b2f15	removed un needed limits	2017-11-24 11:49:57 +01:00
zmagod	d200e355ed	follow @Ducz0r 's suggestions	2017-11-24 11:45:07 +01:00
Zanz2	e7e37939a9	quick fix to expected result losing html	2017-11-24 11:18:12 +01:00
Zanz2	dc5904aed9	Fixed this jira issue and added workarounds for bugs	2017-11-24 01:45:40 +01:00
mlorb	9e7b75a880	Merge pull request #892 from mlorb/ml-sci-1215_v2 ... Make background gray for paperclip images [SCI-1215]	2017-11-23 17:32:09 +01:00
Mojca Lorber	0ffe476a54	make background gray for paperclip images	2017-11-23 14:35:42 +01:00
mlorb	c46d630f0b	Merge pull request #891 from mlorb/ml-sci-1617 ... Add copying of TinyMce assets when cloning the protocol [SCI-1617]	2017-11-23 14:31:29 +01:00
Luka Murn	00fe267a2a	Minor codestyle fixes	2017-11-23 11:33:39 +01:00
Zanz2	764e5259d1	Fixed last review, and a bug i found	2017-11-22 23:38:22 +01:00
Mojca Lorber	fe5828fa97	add copying of TinyMce assets when cloning the protocol	2017-11-22 16:47:21 +01:00
zmagod	afbeafb137	adds RTE images import, disables turbolinks on edit step actions	2017-11-22 16:28:14 +01:00
Zanz2	692ed62d6d	made case statement nicer	2017-11-21 21:27:19 +01:00