scinote-web

mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 07:01:58 +08:00

Author	SHA1	Message	Date
Zmago Devetak	0583979cf9	Merge pull request #993 from ZmagoD/zd_SCI_2039 fixes errors with form id duplicates [fixes SCI-2039]	2018-02-15 11:10:43 +01:00
Matej Zrimšek	09c5e23adf	Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	d571ab2ed8	Fixed comments permissions for experiment level.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	6b1fee4d30	Added/joined repository record assignment to task with sample assignmment to task.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	f21c794a95	Fixed permission error when accessing samples page.	2018-02-14 14:39:09 +01:00
Matej Zrimšek	68206cb591	Added missing checks for whether task/experiment/project is active for experiment level permissions. Minor code refactoring and restyling.	2018-02-14 14:39:08 +01:00
Matej Zrimšek	d55734e501	Added additional permission checks for moving tasks. Added forgotten enclosing tag in a view.	2018-02-14 14:39:07 +01:00
Matej Zrimšek	8ef6c8f91f	Refactored remaining experiment level permissions (and everything below it).	2018-02-14 14:39:07 +01:00
Matej Zrimšek	0706d16020	Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	7938c2e036	Minor code style changes.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	d6e7ef465c	Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]	2018-02-14 14:19:22 +01:00
Matej Zrimšek	854333b0e6	Grouped permissions for experiment with canaid gem (WIP).	2018-02-14 14:19:00 +01:00
Matej Zrimšek	d058c371d4	Readded project archive permission.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	900446557b	Fixed mistyped permission checker.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	e36ec69ca9	Project level permissions refactoring (mostly names).	2018-02-14 13:16:32 +01:00
Matej Zrimšek	93536afcd5	Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	13e9a2a132	Corrected some project level permissions; minor refactoring.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	e5799ee6dc	Some permission fixes.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	d423700e84	Used permissions where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	321ddc2916	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
zmagod	ace78cfb58	fixes errors with form id duplicates [fixes SCI-2039]	2018-02-09 14:54:16 +01:00
Zanz2	128f15f984	Merge pull request #990 from Zanz2/code_formatting_sci1822 Commands in protocols io steps are now properly formatted like code [SCI-1822]	2018-02-08 08:52:44 +01:00
Zanz2	49a4d9cf23	Tables now no longer have huge whitespace below them, it is now fixed 300 pixels and when its too big the table gets a scrollbar	2018-02-07 15:50:42 +01:00
Zanz2	60aa1a0953	Authors are now displayed as actual authors, not the person that added the protocol, and the created at date from protocols io is in protocol info, like it was before	2018-02-07 15:12:03 +01:00
Zanz2	a6356d2420	Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines	2018-02-07 14:46:25 +01:00
Zmago Devetak	b33d09536e	Merge pull request #987 from ZmagoD/zd_SCI_2033 fixes user dropdown [fixes SCI-2033]	2018-02-07 14:34:37 +01:00
Zanz2	efaf5ad721	Commands now get styled like code	2018-02-07 13:51:22 +01:00
Zanz2	367eff6401	re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches	2018-02-07 11:17:53 +01:00
zmagod	695e9d90d2	fixes user dropdown [fixes SCI-2033]	2018-02-07 08:43:42 +01:00
Zmago Devetak	25a42658c8	Merge pull request #980 from ZmagoD/zd_SCI_2009 adds nil check in step_table_element for table name [fixes SCI-2009]	2018-02-06 15:44:56 +01:00
Zanz2	83e9550feb	Merge pull request #966 from Zanz2/images_not_imported_SCI1807 Images not imported [SCI-1807]	2018-02-06 14:33:35 +01:00
Zanz2	dac59cf4d0	Refactored to PR, deleted unrelated things	2018-02-06 09:06:33 +01:00
zmagod	ad742ac2d1	adds nil check in ste_table_element for table name [fixes SCI-2009]	2018-02-05 16:27:04 +01:00
zmagod	25dcfe66ae	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960	2018-02-01 16:04:05 +01:00
okriuchykhin	def08a3faa	Merge pull request #971 from okriuchykhin/ok_SCI_1968 Update notification settings accessor names and update Rubocop config [SCI-1968]	2018-01-31 15:40:09 +01:00
zmagod	366b67ca1c	fixes per @mojca 's request	2018-01-31 15:18:18 +01:00
zmagod	b1684dbd5b	removed unneeded hook	2018-01-31 14:40:19 +01:00
zmagod	34f5076b04	fixes failin specs [fixes SCI-2001]	2018-01-31 12:05:45 +01:00
Oleksii Kriuchykhin	7a769bbfde	Update notification settings accessor names and update Rubocop config [SCI-1968]	2018-01-29 16:15:12 +01:00
zmagod	029d69b033	revert to old setting [fixes SCI-1967]	2018-01-29 15:42:22 +01:00
Zanz2	70a972c264	Fixed pr and small oversight	2018-01-27 14:33:01 +01:00
Zanz2	2a287193b7	Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_fix	2018-01-27 13:50:35 +01:00
Zanz2	e8f6dc0d24	Merge pull request #962 from Zanz2/missing_error_SCI1993 A red error messagge is now displayed when not selecting protocol [SCI-1993]	2018-01-26 16:00:15 +01:00
Zanz2	1d4ce42f23	fixed according to PR	2018-01-26 15:29:13 +01:00
Zanz2	98b3ddbdb0	Merge branch 'master' into images_not_imported_SCI1807	2018-01-26 15:13:40 +01:00
Zanz2	020e9ddc16	Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_not_imported_SCI1807	2018-01-26 11:08:47 +01:00
Zanz2	6f56f829da	Now protocols name from attached protocol is shortened based on title limit length (255 characters),also has same limitations as scinote title	2018-01-26 10:49:38 +01:00
Zanz2	fc541147c8	A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone	2018-01-25 15:54:38 +01:00
zanzdebian	8bd8c34c4d	Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button)	2018-01-25 13:45:35 +01:00
Zmago Devetak	1e407bd9c5	removes unneeded classes	2018-01-25 11:00:48 +01:00
zmagod	76b08e6ac9	add permissions in views	2018-01-24 13:59:57 +01:00
Zanz2	00ac774fde	Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result	2018-01-24 13:40:13 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
okriuchykhin	aef80f86b5	Merge pull request #934 from okriuchykhin/ok_SCI_1931 Fix protocol import button [SCI-1931]	2018-01-18 10:30:19 +01:00
okriuchykhin	8394055fba	Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2 Remove Addons caption if no addons in info modal and fix linter packages	2018-01-17 15:33:43 +01:00
Zmago Devetak	26f7a94392	Merge pull request #943 from ZmagoD/zd_SCI_1866_v2 fixes first element both in Rails part an React part off the application	2018-01-17 14:12:52 +01:00
okriuchykhin	38aaaa011c	Merge pull request #936 from okriuchykhin/ok_SCI_1939 Fix repository records import [SCI-1939]	2018-01-17 12:55:11 +01:00
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
zmagod	0922ee21a7	fixes first element in global activities logs[fixes SCI-1866]	2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin	86853e8fc1	Fix repository item export [SCI-1945]	2018-01-17 10:39:01 +01: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
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
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
Zanz2	3c6d37ce64	Fixed according to PR review	2018-01-11 18:37:36 +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	eb8124ea5a	follow @duco 's suggestions	2018-01-05 17:08:00 +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
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	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
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
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
zmagod	f76dc29e61	fix change user role [fixes SCI-1669]	2017-10-23 15:48:12 +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
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
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
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
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	30d091dc65	adds label under protocols keywords input [fixes SCI-1560]	2017-10-17 14:10:56 +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
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
okriuchykhin	db9a031581	Merge pull request #813 from okriuchykhin/ok_SCI_1642 Refactor canvas [SCI-1642]	2017-10-12 17:45:34 +02:00
Oleksii Kriuchykhin	56f52ebfa7	Optimize memory usage in samples/repositories import [SCI-1665]	2017-10-12 14:43:25 +02:00
Zanz2	5d667f146e	Moved .js form reset and made a standalone description method	2017-10-11 17:59:09 +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
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
Oleksii Kriuchykhin	bd26052110	Remove GIOT sign-in button [GIOT-55]	2017-10-09 11:56:46 +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
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
Oleksii Kriuchykhin	6820511ea0	Further canvas optimizations [SCI-1642]	2017-10-06 12:43:27 +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	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	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
zmagod	3dc3ed906f	fixes bug with embedded images [fixes SCI.1624]	2017-10-02 18:06:42 +02:00
Oleksii Kriuchykhin	6824f9a8bc	Improve memory utulization in PDF report generator [SCI-1482]	2017-10-02 11:29:22 +02:00
zmagod	cb4bacc372	refactor preferences page [fixes SCI-1564]	2017-09-28 16:53:51 +02:00
zmagod	26b526d61b	adds getter and setters for user settings	2017-09-27 14:38:52 +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	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
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	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
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	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
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
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
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
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	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
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
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
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
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	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	31e8c107fd	dodav na pravi branch te file	2017-09-11 14:35:00 +02:00
Jure Grabnar	b4a13dffe3	init commit, dodav na protocols index gumb z dropdown	2017-09-11 13:07:22 +02:00
Mojca Lorber	0e14420193	fix bugs with importing samples	2017-09-06 14:41:14 +02:00
zmagod	9c01ab414c	refactor leave team	2017-09-01 17:10:43 +02:00
zmagod	91d2d8a935	adds team details view	2017-08-31 15:56:55 +02:00
zmagod	1325732b0c	adds specs for team controller actions	2017-08-30 16:18:21 +02:00
Oleksii Kriuchykhin	c3fceb90df	Backport API to Rails-4 [SCI-1579]	2017-08-30 13:30:41 +02:00
zmagod	ee054f91b8	adds bullet gem [fixes SCI-1578]	2017-08-30 09:29:45 +02:00
zmagod	478bd491ff	added pagination and sorting to team tables	2017-08-28 17:05:09 +02:00
zmagod	5ea464b675	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1497	2017-08-28 09:36:29 +02:00
zmagod	db16da7bd6	adds custom query to fetch teams data	2017-08-25 16:07:37 +02:00
zmagod	34be62a648	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1493_v3	2017-08-25 08:58:20 +02:00
zmagod	782daabce1	first run	2017-08-25 08:54:32 +02:00
Toni Dezman	dd5c329ef1	makes redux work with Notifications	2017-08-22 09:46:44 +02:00
Toni Dezman	522262f9fe	adds timezone	2017-08-22 09:46:29 +02:00
Toni Dezman	52b1603b92	adds MyStatistics logic	2017-08-22 09:44:51 +02:00
Toni Dezman	a3d126b073	adds Redux and few fields	2017-08-22 09:41:47 +02:00
Toni Dezman	0de080485e	adds avatar and editable inputs	2017-08-22 09:39:50 +02:00
zmagod	685cb42aac	fixes repository, protocols link, adds csfr token to request headers	2017-08-21 15:30:54 +02:00
zmagod	c5e32c4ea0	Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch	2017-08-21 09:52:14 +02:00
Luka Murn	9227ea5854	Finish the user settings jsonb, also fix references throughout app Closes SCI-1475.	2017-08-10 14:29:01 +02:00
Luka Murn	c62002381b	Add default settings migration and concern	2017-08-10 11:30:57 +02:00
zmagod	007f50a158	adds main stylesheet for global styles	2017-08-09 12:46:04 +02:00
zmagod	bd352869a3	adds user account dropdown	2017-08-09 09:08:13 +02:00
zmagod	226458a3f0	adds recent notifications	2017-08-08 15:44:28 +02:00
Luka Murn	c6448264d0	Revert "Td sci 1492"	2017-08-07 11:47:21 +02:00
zmagod	be29db2f78	changed folder name	2017-08-07 11:13:09 +02:00
Luka Murn	ae5bccf709	Merge branch 'master' into rails-5.1 Conflicts: Gemfile.lock app/datatables/repository_datatable.rb app/models/repository_cell.rb	2017-08-07 08:45:53 +02:00
zmagod	c314bae28d	add team switch js/controller	2017-08-03 16:03:15 +02:00
zmagod	2e83322f76	fixes global activities	2017-08-03 11:17:09 +02:00
zmagod	6ef19725f1	adds redux	2017-08-02 17:27:05 +02:00
zmagod	caae1e2fe8	adds intl, router, bootstrap to npm modules	2017-07-31 10:42:40 +02:00
Toni Dezman	ffda8b259b	adds Redux and changes to index.jsx page	2017-07-28 10:52:25 +02:00
Toni Dezman	1673d43993	adds react/settings controller and react/layout	2017-07-27 15:26:03 +02:00
Toni Dezman	0f4286d5d1	adds Settings index react page	2017-07-27 14:21:27 +02:00
Oleksii Kriuchykhin	6c33b46f6a	Improve import of repository records plus tsv file import fixes [SCI-1487]	2017-07-20 11:44:10 +02:00
Zmago Devetak	7b898666da	Merge pull request #745 from ZmagoD/zd_SCI_1485 refactor repositories js files [fixes SCI-1485]	2017-07-19 11:17:52 +02:00
Oleksii Kriuchykhin	ece27b2652	Fix importing files with empty header cells and error messages improvements [SCI-1484]	2017-07-18 14:54:35 +02:00
zmagod	a2b7bcda4c	refactor repositories js files [fixes SCI-1485]	2017-07-17 15:05:28 +02:00
Luka Murn	73a4cd1e4f	Merge pull request #737 from Ducz0r/lm-sci-1450 Add versioning modal & support to sciNote [SCI-1450]	2017-07-11 09:47:51 +02:00
Oleksii Kriuchykhin	a6b80589f2	Fix default order of the columns in repositories [SCI-1445]	2017-07-10 15:32:18 +02:00
Luka Murn	3e80f761b8	Add "about" modal, prepare hooks, VERSION system for addons Also the addon generator is fixed so it properly creates VERSION file for new addons.	2017-07-10 15:27:50 +02:00
Luka Murn	16e672b9d8	Add VERSION file where the sciNote Core version is stored	2017-07-10 09:26:35 +02:00
Luka Murn	9f60ece25f	Merge branch 'master' into rails-5.1 Conflicts: app/models/repository.rb app/models/repository_row.rb app/views/projects/index.html.erb app/views/shared/_secondary_navigation.html.erb	2017-07-06 15:12:15 +02:00
okriuchykhin	2e24e6b73a	Merge pull request #725 from okriuchykhin/ok_SCI_1409 Fix datatables [SCI-1409]	2017-07-03 15:47:19 +02:00
Oleksii Kriuchykhin	b234c07c13	Fix datatables [SCI-1409]	2017-07-03 15:33:50 +02:00
lenart	74e723d5d5	Changed data hook name and form id [SCI-1430]	2017-07-03 11:28:35 +02:00
lenart	8ec458db91	Added data hook and form id for GA tracking [SCI-1430]	2017-06-30 10:06:54 +02:00
Mojca Lorber	a3514bdaf0	fix restore action from archives pages	2017-06-29 16:14:25 +02:00
Mojca Lorber	4fb07e1e4f	fix edit comments	2017-06-29 13:33:59 +02:00
Mojca Lorber	2ab74c8979	add user variable	2017-06-29 12:56:14 +02:00
Mojca Lorber	21b4ba7627	fix bugs on projects page	2017-06-28 17:15:09 +02:00
Matej Zrimšek	4dbf5b0f53	Fixed sample types page load error, when viewing them on a task level. [SCI-1419]	2017-06-27 16:28:25 +02:00
mlorb	025050a7cd	Merge pull request #716 from mlorb/ml-sci-1420 Add tooltips to navigation bar [SCI-1420]	2017-06-27 14:52:07 +02:00
Mojca Lorber	d03be76f35	add tooltips to archive buttons	2017-06-27 14:48:45 +02:00
Mojca Lorber	0160956377	put all titles on links	2017-06-27 14:21:06 +02:00
Mojca Lorber	6bfb5e125c	add tooltips to navigation bar	2017-06-27 13:46:49 +02:00
okriuchykhin	d126391940	Merge pull request #710 from okriuchykhin/ok_SCI_1356 Add global search in custom repositories [SCI-1356]	2017-06-27 13:41:53 +02:00
Oleksii Kriuchykhin	69231060b0	Fix checking of my_modules presence [SCI-1356]	2017-06-27 13:39:08 +02:00
Zmago Devetak	6c541602e7	Merge pull request #715 from ZmagoD/zd_SCI_1328_v2 fixes smart annotations bug in reports [fixes SCI-1328]	2017-06-27 13:34:29 +02:00
Oleksii Kriuchykhin	4060ba2ac3	Code style fixes [SCI-1356]	2017-06-27 13:23:51 +02:00
mz3944	ca59ac5e36	Merge pull request #714 from mz3944/mz-SCI-1402 Missing error message when not selecting name in case of import repository file [SCI-1402]	2017-06-27 11:54:26 +02:00
zmagod	7b9410f02f	fixes smart annotations bug in reports [fixes SCI-1328]	2017-06-27 11:26:32 +02:00
Matej Zrimšek	f847b44067	Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402]	2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin	84556cf744	Fix naming of repository items in modal and messages [SCI-1404]	2017-06-26 16:03:02 +02:00
Oleksii Kriuchykhin	e038bc58fa	Add global search in custom repositories [SCI-1356]	2017-06-23 16:12:56 +02:00
Zmago Devetak	cffac82e88	Merge pull request #704 from ZmagoD/zd_SCI_1392 fixes bug with long text in parse records modal [fixes SCI-1392]	2017-06-22 17:47:15 +02:00
zmagod	2b2f513366	fixes export pdf error on production	2017-06-22 16:40:50 +02:00
zmagod	a2e1aa5b36	fixes bug with long text in parse records modal [fixes SCI-1392]	2017-06-22 14:43:01 +02:00
zmagod	28129ebb73	refactor	2017-06-21 17:39:20 +02:00
zmagod	bad52ceff1	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336	2017-06-21 15:56:07 +02:00
zmagod	f66fb49b56	adds import records to repositories [fixes SCI-1336]	2017-06-21 14:45:50 +02:00
zmagod	f64e1ac713	fix locales	2017-06-21 09:31:39 +02:00
Matej Zrimšek	d49524a26f	Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378]	2017-06-20 16:10:50 +02:00
mlorb	122ac7971f	Merge pull request #692 from mlorb/ml_sci_1348 Fix cog position on repositories page [SCI-1348]	2017-06-19 15:16:01 +02:00
zmagod	70fa681519	split the import service	2017-06-19 14:05:37 +02:00
Mojca Lorber	4c3036af87	fix ordering of repositoris on task	2017-06-19 10:53:18 +02:00
Mojca Lorber	b6f146f177	fix cog position on repositories page	2017-06-16 11:54:31 +02:00
Oleksii Kriuchykhin	94d74b8101	Make assigned column always visible in repositories [SCI-1346]	2017-06-16 11:47:41 +02:00
zmagod	2d3b5f4308	refactor	2017-06-14 10:55:24 +02:00
zmagod	cee052fc19	added service object	2017-06-14 09:11:20 +02:00
okriuchykhin	97a94ff4a3	Merge pull request #679 from okriuchykhin/ok_SCI_1345 Fix repository view permissions for team guests [SCI-1345]	2017-06-13 15:47:44 +02:00
mlorb	074a47aae1	Merge pull request #675 from mlorb/ml_sci_1272 Fix permissions [SCI-1272]	2017-06-13 10:51:04 +02:00
Oleksii Kriuchykhin	2d693a3fb7	Fix repository view permissions for team guests [SCI-1345]	2017-06-13 10:33:08 +02:00
Zmago Devetak	19adddbfdb	Merge pull request #666 from ZmagoD/zd_SCI_1337 truncate long repository names [fixes SCI-1337]	2017-06-13 09:32:43 +02:00
mlorb	d0d7dc7468	Merge pull request #677 from mlorb/ml_sci_1344 Change custom repositories icon [SCI-1344]	2017-06-13 08:57:22 +02:00
zmagod	a865253a2e	first run	2017-06-13 08:10:10 +02:00
Mojca Lorber	faa6456e28	change custom repositories icon	2017-06-12 18:00:28 +02:00
Mojca Lorber	9108102b42	fix permissions	2017-06-12 17:34:36 +02:00
Matej Zrimšek	29b721365a	Moved export form to proper place in the code. [SCI-1275]	2017-06-09 19:44:28 +02:00
rekonder	4df8e1ffe3	Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository	2017-06-09 19:44:28 +02:00
rekonder	ede744849b	Export repository [aj-SCI-1275]	2017-06-09 19:44:28 +02:00
Luka Murn	e26337d5ee	Merge pull request #671 from biosistemika/custom-repositories Merge custom-repositories into master	2017-06-09 18:46:47 +02:00
zmagod	ee9eaea47c	truncate long repository names [fixes SCI-1337]	2017-06-09 11:20:57 +02:00
Zmago Devetak	4873624cec	Merge pull request #658 from ZmagoD/zd_SCI_1011 Multiple file upload with drag & drop capability in steps and results	2017-06-09 10:03:33 +02:00
zmagod	33b996ffee	refactor	2017-06-09 09:49:57 +02:00
Luka Murn	c7c3c46d9d	Fix dropdown	2017-06-08 15:26:57 +02:00
Mojca Lorber	be52af4e4f	fix rename/delete/copy modals not working	2017-06-08 15:13:00 +02:00
Mojca Lorber	0004c2b7d5	fix selection of tab after redirection	2017-06-08 14:17:27 +02:00
Mojca Lorber	71c523c406	load tabs with javascript	2017-06-08 13:47:30 +02:00
Luka Murn	2ab31aba2f	Merge pull request #660 from Ducz0r/lm-sci-1270 Copy repository functionality [SCI-1270]	2017-06-08 11:45:57 +02:00
Luka Murn	27feb46d8f	Merge pull request #659 from Ducz0r/lm-sci-1279 Include repositories in reports [SCI-1279]	2017-06-08 11:24:21 +02:00
Luka Murn	61eb52f86f	Implement GUI for copying repositories Closes SCI.1270.	2017-06-07 19:11:25 +02:00
Luka Murn	38361e4bb4	Setup initial GUI	2017-06-07 18:43:48 +02:00
Matej Zrimšek	77a225ec31	Added toggle between assigned and all repository records. [SCI-1276]	2017-06-07 18:13:25 +02:00
Luka Murn	02dd6636ba	Allow saving & editing of reports with repository elements Closes SCI-1279.	2017-06-07 16:55:00 +02:00
Luka Murn	b5f6d1da94	Allow custom repositories to be added to reports	2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin	8b1190060e	Add custom repository table [SCI-1274]	2017-06-07 15:23:25 +02:00
Zmago Devetak	fcec42ae31	Merge pull request #645 from ZmagoD/zd_SCI_1278 generates samples csv file in background job [fixes SCI-1278]	2017-06-07 15:04:24 +02:00
zmagod	c6bb20039b	adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]	2017-06-07 13:29:39 +02:00
Mojca Lorber	51c4eeb106	renaming	2017-06-06 15:50:43 +02:00
Mojca Lorber	39dda1ad5d	refactoring	2017-06-06 13:18:44 +02:00
ajugo	887d9a4f52	Samples - show all/show assigned [SCI-1277] (#644 ) * Samples - show all/show assigned [SCI-1277] * Some fixes in code * Some minor fixes in code * Omit present * Correct missed present * Fixing hound warnings	2017-06-06 12:46:56 +02:00
Mojca Lorber	acdea2198d	code changes after rebasing	2017-06-06 11:10:55 +02:00
Mojca Lorber	da98788031	small code fixes	2017-06-06 09:57:50 +02:00
Mojca Lorber	13bf4ad229	create new repository	2017-06-06 09:54:39 +02:00
Matej Zrimšek	419d638163	Renamed reposiotry edit and destroy permission helper. [fix 1269]	2017-06-05 17:36:26 +02:00
zmagod	ab4961ddb1	adds overlay partial	2017-06-05 11:31:05 +02:00
zmagod	67d902db52	refactor	2017-06-05 10:43:58 +02:00
Matej Zrimšek	d8d54232c3	After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]	2017-06-02 19:08:51 +02:00
Matej Zrimšek	73aaef0949	Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269]	2017-06-02 17:52:04 +02:00
Matej Zrimšek	5c9a453439	Added permissions for deleting and renaming of repositories. [SCI-1269]	2017-06-02 17:50:34 +02:00
Matej Zrimšek	9a7048cc7a	Code formatting updated for repositories. [SCI-1269]	2017-06-02 17:50:34 +02:00
Matej Zrimšek	f8258812ef	Repository remove and rename refactoring. [SCI-1269]	2017-06-02 17:50:34 +02:00
Matej Zrimšek	21a72da84f	Added rename logic and improved remove logic. [SCI-1269]	2017-06-02 17:50:34 +02:00
Matej Zrimšek	cdaac6a01b	Added remove repository modal logic. [SCI-1269]	2017-06-02 17:50:33 +02:00
Matej Zrimšek	791bb934ca	Remove repository modal logic (WIP). [SCI-1269]	2017-06-02 17:50:33 +02:00
Matej Zrimšek	b92a760a5c	Added dropdown GUI for editing repository. [SCI-1269]	2017-06-02 17:47:28 +02:00
zmagod	1c021b11db	adds drag and drop files upload to steps [fixes SCI-1310]	2017-06-02 16:34:09 +02:00
okriuchykhin	c88fc84538	Merge pull request #633 from okriuchykhin/ok_SCI_960_v2 Add smart annotations in sample info modal [SCI-960]	2017-05-31 11:31:14 +02:00
Luka Murn	fcc3995049	Merge pull request #647 from biosistemika/master Bring latest master changes into custom-repositories	2017-05-30 14:18:14 +02:00
zmagod	6e1f93dd11	minor fix	2017-05-29 14:47:05 +02:00
zmagod	b527afd12b	generates samples csv file in background job [fixes SCI-1278]	2017-05-29 14:42:55 +02:00
Zmago Devetak	1df6265326	Merge pull request #627 from ZmagoD/zd_SCI_1280 prevent to duplicate new step [fixes SCI-1280]	2017-05-29 09:55:22 +02:00
Mojca Lorber	c3051421b2	change truncate function	2017-05-25 11:01:24 +02:00
Mojca Lorber	8540f88b7e	small fix - renaming of ids and hrefs	2017-05-25 10:06:48 +02:00
mlorb	872f712be8	Merge branch 'custom-repositories' into ml_sci_1266_v2	2017-05-23 11:05:25 +02:00
mz3944	6b8c8deb16	Merge pull request #634 from mz3944/mz-SCI-414 Uncompleted steps not added to Reports	2017-05-23 09:58:05 +02:00
Oleksii Kriuchykhin	b223646f07	Small improvements [SCI-1273]	2017-05-23 08:53:53 +02:00
Mojca Lorber	a716a0b1db	change breadcrumbs on protocol managements page	2017-05-22 17:58:42 +02:00
Mojca Lorber	9ae615264d	add global repositories screen - tab control	2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin	e99e3edb7b	Add repositories dropdown to task navigation [SCI-1273]	2017-05-18 14:21:00 +02:00
Matej Zrimšek	20265ddd69	Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]	2017-05-17 18:18:57 +02:00
Matej Zrimšek	f78c80b148	Added possibility to add uncompleted steps to report. [closes SCI-414]	2017-05-17 13:25:21 +02:00
Oleksii Kriuchykhin	7f713b4293	Add smart annotations in sample info modal [SCI-960]	2017-05-17 13:06:21 +02:00
zmagod	b21923cf98	prevent to duplicate new step [fixes SCI-1280]	2017-05-16 11:52:07 +02:00
Matej Zrimšek	2c6f888cbc	Replace present? with more efficient exitst? for report content adding modal. [fixes SCI-487]	2017-05-15 18:56:41 +02:00
Matej Zrimšek	901558c733	Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	ba693c65a8	Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	dbb79ebab1	Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
Matej Zrimšek	b97cb91840	Refactoring of modal for adding content to report. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
Matej Zrimšek	27cfd55ea5	Simplified popup modal for adding contents to report. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
zmagod	9bec7dd96e	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248	2017-05-15 14:49:37 +02:00
zmagod	d34b2520b5	refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]	2017-05-12 15:59:58 +02:00
zmagod	070a829c49	change new results hendlers	2017-05-12 10:02:33 +02:00
Oleksii Kriuchykhin	bb8c7c342c	Add additional info to samples info modal [SCI-960]	2017-05-11 22:20:06 +02:00
zmagod	81a3cb0a41	adds results js code in modules	2017-05-11 16:54:28 +02:00
okriuchykhin	15f19b73fb	Merge pull request #610 from okriuchykhin/ok_SCI_1253 Add notifications counter badge to project card [SCI-1253]	2017-05-11 11:11:09 +02:00
okriuchykhin	000ca26452	Merge pull request #607 from okriuchykhin/ok_SCI_1243 Add specific classes to task card for analytics [SCI-1243]	2017-05-11 11:10:05 +02:00
Oleksii Kriuchykhin	a5926726ce	Add notifications counter badge to project card [SCI-1253]	2017-05-10 17:28:37 +02:00
zmagod	2081e0a94b	Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1	2017-05-10 15:14:17 +02:00
Oleksii Kriuchykhin	08e7f09d07	Add specific classes to task card for analytics [SCI-1243]	2017-05-10 10:33:34 +02:00
okriuchykhin	ccc640f2bc	Merge pull request #593 from okriuchykhin/ok_SCI_1158 Add advanced search options [SCI-1158]	2017-05-09 10:23:34 +02:00
okriuchykhin	bd0b930382	Merge pull request #598 from okriuchykhin/ok_SCI_152 Add counters for users and comments on canvas [SCI-152]	2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin	344b9c290a	Add counters for users and comments on canvas [SCI-152]	2017-05-08 17:32:55 +02:00
Zmago Devetak	4b816f5322	Merge pull request #568 from ZmagoD/zd_SCI_1119 Add images to fields with rich text formatting	2017-05-08 13:06:58 +02:00
Oleksii Kriuchykhin	0ee7e11620	Add advanced search options [SCI-1158]	2017-05-05 16:41:23 +02:00
Zmago Devetak	de3d1172c1	Merge pull request #584 from ZmagoD/zd_SCI_1200 add popup for approval to complete the Task [fixes SCI-1200]	2017-05-05 14:57:27 +02:00
Zmago Devetak	28042d11e1	Merge pull request #589 from ZmagoD/zd_SCI_488 adds label to step in report [fixes SCI-488]	2017-05-05 14:56:01 +02:00
zmagod	b22350136f	adds label to step in report [fixes SCI-488]	2017-05-05 09:45:18 +02:00
zmagod	8d0c22327b	adds asc order to checklists [fixes SCI-1228]	2017-05-04 15:17:34 +02:00
zmagod	acc5594f1b	add popup for approval to complete the Task [fixes SCI-1200]	2017-05-04 12:41:22 +02:00
Mojca Lorber	f8f6a5f63a	fix bug edit canvas not working and fix positioning of cloned task/workflow	2017-05-04 10:54:50 +02:00
Matej Zrimšek	a5cffd06f3	Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]	2017-04-25 16:03:50 +02:00
zmagod	86c6ae3b03	display tinyMCE images in reports	2017-04-25 09:53:35 +02:00
zmagod	55c8c498e2	add image upload functionality to result text	2017-04-24 12:28:27 +02:00
zmagod	550f563666	working version for steps first run	2017-04-21 16:09:04 +02:00
zmagod	c25df63a14	add tinymce img importer and refactor input sanitize helper	2017-04-19 09:11:52 +02:00
okriuchykhin	3d805d529d	Merge pull request #554 from okriuchykhin/ok_SCI_877 Add image preview to protocol repository [SCI-877]	2017-04-18 08:58:39 +02:00
Oleksii Kriuchykhin	4fac6484b5	Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877]	2017-04-14 16:05:35 +02:00
zmagod	f104444a0c	adds additional explanations [fixes SCI-1103]	2017-04-12 16:56:47 +02:00
Oleksii Kriuchykhin	181d981a51	Add image preview to protocol repository [SCI-877]	2017-04-12 16:05:38 +02:00
Zmago Devetak	9c31239318	Merge pull request #552 from biosistemika/release-1.9.0 Release 1.9.1	2017-04-12 13:08:37 +02:00
zmagod	9610c5f5a0	fix info dropdown links [fixes SCI-1141]	2017-04-07 11:31:09 +02:00
zmagod	f16607579f	refactor steps annotation	2017-04-06 13:03:13 +02:00
mlorb	317739af1e	Merge pull request #530 from biosistemika/ml_sci_1044 Add data-hook and yadcf-filter plug-in [SCI-1044]	2017-03-31 14:00:23 +02:00
Mojca Lorber	503ee5b62e	change place of data-hook	2017-03-30 17:21:29 +02:00
Mojca Lorber	9458f391e5	add data-hook and yadcf-filter plug-in	2017-03-29 15:59:51 +02:00
Zmago Devetak	0019fd19ea	Merge pull request #525 from ZmagoD/zd_SCI_765 Export large files - utility class	2017-03-29 11:55:51 +02:00
zmagod	0096f9dc14	refactor	2017-03-29 09:32:23 +02:00
okriuchykhin	05a49e5a82	Merge pull request #528 from okriuchykhin/ok_SCI_1133 Fix secondary navigation on Mac [SCI-1133]	2017-03-29 09:30:34 +02:00
Oleksii Kriuchykhin	391c5af267	Fix secondary navigation on Mac [SCI-1133]	2017-03-28 14:36:52 +02:00
zmagod	7039420f99	add hook to canvas module actions	2017-03-28 10:43:39 +02:00
zmagod	0996c14449	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765	2017-03-27 10:41:58 +02:00
zmagod	2235fd3fb7	adds view if download expires	2017-03-27 10:38:28 +02:00
mlorb	3beb179f87	Merge pull request #514 from biosistemika/ml_sci_1089 Add error messages to sample group/type edit/delete actions [SCI-1089]	2017-03-27 09:57:32 +02:00
zmagod	4635a3320d	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends	2017-03-24 16:09:28 +01:00
Zmago Devetak	804fb2fec9	Merge pull request #519 from ZmagoD/zd_SCI_1092_v2 adds hooks in team switch [fixes SCI-1092]	2017-03-24 12:56:52 +01:00
zmagod	023b3213e8	fixes email link [fixes SCI-765]	2017-03-24 12:10:07 +01:00
Mojca Lorber	83fa8570d7	refactoring	2017-03-17 17:52:15 +01:00
zmagod	c244e69e81	fixed report comments bug [fixes SCI-1100]	2017-03-17 16:59:40 +01:00
zmagod	70f17a924e	adds hooks in team switch [fixes SCI-1092]	2017-03-17 16:10:22 +01:00
Mojca Lorber	7a4e3201e7	add error messages to sample group/type edit/delete actions	2017-03-14 17:32:25 +01:00
zmagod	5d372851d3	fixes reports comment bug [fixes SCI-1100]	2017-03-14 16:24:02 +01:00
zmagod	856a4611c6	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends	2017-03-14 15:58:08 +01:00
zmagod	7b16e5643e	fix assets preprocesor for wopi files	2017-03-13 13:20:49 +01:00
zmagod	0c2523beca	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-03-10 16:21:43 +01:00
okriuchykhin	2a33391f4b	Merge pull request #511 from okriuchykhin/ok_SCI_1090 Refactoring of the comments using STI [SCI-1090]	2017-03-10 10:50:43 +01:00
Luka Murn	1e3a697a91	Merge pull request #508 from biosistemika/lm-sci-838-fix Open edit/view Office files in new browser tab/window [SCI-838]	2017-03-09 10:39:16 +01:00
Luka Murn	0e8f5f8e99	Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix Conflicts: app/views/my_modules/_state_buttons.html.erb	2017-03-09 08:44:09 +01:00
zmagod	5c2e9a4b04	adds extends and fixes report methods	2017-03-08 14:14:03 +01:00
Luka Murn	800df7a26b	Also make button icons work when rendering them via JS Closes SCI-1073.	2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin	0f8336e5a5	Refactoring of the comments using STI [SCI-1090]	2017-03-08 13:18:20 +01:00
Luka Murn	7c9aa2e476	Hide complete&uncomplete task buttons if user cannot do it Closes SCI-1091.	2017-03-06 16:01:04 +01:00
Luka Murn	86a800a84e	Open edit/view Office files in new browser tab/window Closes SCI-838.	2017-03-06 14:12:18 +01:00
Luka Murn	473487faec	Add HTML <head><title> to edit, view file pages Closes SCI-1049.	2017-03-06 13:55:07 +01:00
Luka Murn	4ddb139911	Fix padding of state buttons Closes SCI-1073.	2017-03-03 16:36:52 +01:00
Luka Murn	3d7f09bde6	Fix protocol state buttons a bit Closes SCI-1073.	2017-02-28 14:35:12 +01:00
Luka Murn	fecfc9e41d	Merge pull request #498 from biosistemika/release-1.8.1 Release 1.8.1	2017-02-23 14:57:30 +01:00
Luka Murn	dc89c160be	Fix a bug with team page not working from user task modal	2017-02-23 14:45:00 +01:00
mlorb	a72a072fac	Merge pull request #495 from mlorb/ml_sci_948 Fix report - checklist items are in separate row than checkboxes [SCI-948]	2017-02-23 10:50:48 +01:00
Mojca Lorber	f84611f558	fix report - checklist items are in separate row than checkboxes	2017-02-22 15:51:26 +01:00
Zmago Devetak	58f97fdb5b	Merge pull request #489 from ZmagoD/zd_SCI_1002_add_hook adds hook for lock task action	2017-02-22 14:24:01 +01:00
mlorb	42e6a99911	Merge pull request #487 from mlorb/ml_sci_1032 Fix visual bug in edit avatar mode [SCI-1032]	2017-02-22 10:59:18 +01:00
mlorb	8c111db31a	Merge pull request #486 from mlorb/ml_sci_1033 Fix user has no teams view [SCI-1033]	2017-02-22 10:58:39 +01:00
zmagod	151dc79a81	adds hook for lock task action	2017-02-21 16:25:50 +01:00
Mojca Lorber	ac0988ef32	add data-hooks for remove manage teams button	2017-02-21 15:39:08 +01:00
Mojca Lorber	0fd41e8a6d	remove changes on user has no teams view	2017-02-21 15:12:58 +01:00
mlorb	ea1711be83	Merge pull request #485 from mlorb/ml_sci_1001 Add data-hook for E-signature manifestation/display [SCI-1001]	2017-02-21 14:25:08 +01:00
mlorb	01d9f306a5	change div to span	2017-02-21 14:22:28 +01:00
Mojca Lorber	6b30f097f0	fix visual bug in edit avatar mode	2017-02-21 14:02:42 +01:00
Mojca Lorber	90864a45a0	fix user has no teams view	2017-02-21 13:08:06 +01:00
Luka Murn	6f1c19ae2d	Fix _user_dropdown.html.erb	2017-02-21 09:27:42 +01:00
Mojca Lorber	cb2127ee7f	add data-hook for E-signature manifestation/display	2017-02-20 18:03:55 +01:00
okriuchykhin	8e18ff44a6	Merge pull request #479 from okriuchykhin/ok_SCI_999 Add task complete/uncomplete functionality [SCI-999]	2017-02-20 15:19:00 +01:00
Luka Murn	ce617894c5	Fix manage project users modal bug Closes SCI-1026.	2017-02-16 15:29:58 +01:00
Oleksii Kriuchykhin	218e96b1f0	Code style fixes [SCI-999]	2017-02-16 11:45:07 +01:00
Luka Murn	d097f0dd15	Merge pull request #477 from Ducz0r/lm-sci-928 Refactor, merge, unify, improve, update, beautify settings page [SCI-928]	2017-02-13 16:42:57 +01:00
Luka Murn	f93cc89624	Fix system notification email links not working bug Closes SCI-964.	2017-02-10 15:13:33 +01:00
Oleksii Kriuchykhin	cf8566df33	Add task complete/uncomplete functionality [SCI-999]	2017-02-10 14:27:20 +01:00
Luka Murn	f7bd62547e	Refactor teams settings into its own controllers	2017-02-09 14:37:59 +01:00
Luka Murn	7bee3a4ea0	Move user profile to settings	2017-02-09 11:34:52 +01:00
Luka Murn	5cb3eb5e09	Refactor preferences -> move them to subcontroller, subroute	2017-02-09 11:07:16 +01:00
okriuchykhin	c2a69982aa	Merge pull request #471 from okriuchykhin/ok_SCI_936 Adds datatable to all teams page [SCI-936]	2017-02-07 10:33:33 +01:00
zmagod	c99a540eb3	adds hook to team name in the invitation template [fixes SCI-930]	2017-02-03 16:53:42 +01:00
Oleksii Kriuchykhin	62535a01bd	Move teams datatable js code into separate file [SCI-936]	2017-02-03 10:44:42 +01:00
Oleksii Kriuchykhin	8b105aa030	Add override hooks [SCI-936]	2017-02-02 23:35:47 +01:00
Zmago Devetak	65bbd81497	Merge pull request #469 from ZmagoD/zd_SCI_929 Adds hook in user settings navigation	2017-02-02 15:01:37 +01:00
mlorb	970d99e6e3	Merge pull request #465 from mlorb/ml_sci_937 Redesign of individual team page [SCI-937]	2017-02-02 11:15:55 +01:00
mlorb	5510fa7751	rename data-hooks in team view	2017-02-02 10:36:23 +01:00
Oleksii Kriuchykhin	db90c5d63b	Add datatable to all teams page [SCI-936]	2017-02-02 09:53:59 +01:00
zmagod	bb42bd04a5	adds hook in user settings navigation	2017-02-01 17:10:22 +01:00
Mojca Lorber	86351ce17d	add data-hooks for billing	2017-02-01 15:01:54 +01:00
Mojca Lorber	d3e0eca44e	redesign individual team page	2017-02-01 14:44:47 +01:00
Oleksii Kriuchykhin	031741d122	Disable protocols link if user has no teams [SCI-934]	2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin	c119b7c014	Make sciNote work for users without any teams [SCI_934]	2017-02-01 14:16:26 +01:00
Zmago Devetak	5c9954bb89	Merge pull request #450 from ZmagoD/zd_SCI_939 Refactor "organizations" to "teams"	2017-02-01 13:12:02 +01:00
okriuchykhin	067b9452a4	Merge pull request #464 from okriuchykhin/ok_SCI_935 Add config option to enable/disable users registration [SCI-935]	2017-02-01 09:36:36 +01:00
Luka Murn	db75231617	Update URLs to sciNote support pages Closes SCI-978.	2017-01-31 15:48:56 +01:00
Oleksii Kriuchykhin	d1e69438de	Add config option to enable/disable users registration [SCI-935]	2017-01-30 15:04:02 +01:00
zmagod	e59b2e039a	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939	2017-01-27 11:15:31 +01:00
Luka Murn	0baaf12de3	Re-display images & checkboxes in PDF reports Closes SCI-953.	2017-01-26 10:46:58 +01:00
Luka Murn	8c5a52417c	Merge pull request #445 from okriuchykhin/ok_SCI_940 Refactor smart annotation/auto_link/simple_format rendering [SCI-940]	2017-01-25 17:49:38 +01:00
okriuchykhin	648d256dff	Merge pull request #448 from okriuchykhin/ok_SCI_945 Fix openning of protocol preview with images [SCI-945]	2017-01-25 17:27:01 +01:00
Oleksii Kriuchykhin	c55f3cb99c	Add flag to disable simple_format in custom_auto_link [SCI-940]	2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin	310d8c1920	Refactor smart annotation/auto_link/simple_format rendering [SCI-940]	2017-01-25 17:18:19 +01:00
zmagod	afd8328e9c	rename ortanizations -> teams	2017-01-25 14:22:06 +01:00
Mojca Lorber	6905fc8c08	remove letter f	2017-01-25 13:20:11 +01:00
Oleksii Kriuchykhin	90e4b26c69	Fix openning of protocol preview with images [SCI-945]	2017-01-25 13:06:12 +01:00
zmagod	72e13beee3	renamed organizations in views	2017-01-25 12:01:23 +01:00
Mojca Lorber	2277af534c	fix table titles	2017-01-25 11:01:35 +01:00
Luka Murn	53699193a2	Merge branch 'smart-annotations' Conflicts: app/assets/javascripts/comments.js.erb app/assets/javascripts/protocols/index.js app/assets/javascripts/protocols/steps.js.erb app/assets/javascripts/samples/sample_datatable.js.erb app/controllers/my_module_comments_controller.rb app/controllers/project_comments_controller.rb app/controllers/result_comments_controller.rb app/controllers/step_comments_controller.rb app/datatables/sample_datatable.rb app/views/my_module_comments/_comment.html.erb app/views/project_comments/_comment.html.erb app/views/projects/show/_experiment.html.erb app/views/reports/elements/_experiment_element.html.erb app/views/reports/elements/_result_comments_element.html.erb app/views/reports/elements/_result_text_element.html.erb app/views/reports/elements/_step_checklist_element.html.erb app/views/reports/elements/_step_comments_element.html.erb app/views/reports/elements/_step_element.html.erb app/views/result_comments/_comment.html.erb app/views/results/_result_text.html.erb app/views/step_comments/_comment.html.erb app/views/steps/_step.html.erb db/schema.rb	2017-01-24 14:33:23 +01:00
zmagod	6e7fa21dd3	adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]	2017-01-24 10:51:12 +01:00
Oleksii Kriuchykhin	d555ba7905	Add export to protocol management page and code style improvements [SCI-742]	2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin	14a6705b55	Implemented protocol export through Zip::OutputStream [SCI-742]	2017-01-23 17:43:48 +01:00
Mojca Lorber	8e02c2e025	add locale - fix	2017-01-20 13:37:07 +01:00
mlorb	9a3c56de97	Merge pull request #421 from mlorb/ml_sci_540 Protocol steps/results - adding titles for tables [SCI-540]	2017-01-20 11:41:49 +01:00
Mojca Lorber	6653f0d4c1	small fixes	2017-01-19 16:42:14 +01:00
Mojca Lorber	4ea154410a	add to fields with rich text formatting	2017-01-19 15:27:24 +01:00
Mojca Lorber	44de927cf4	display smart annotations in reports - without rich text fields	2017-01-19 14:22:54 +01:00
zmagod	2cbb8ba41a	removed unneeded comments	2017-01-19 12:54:48 +01:00
zmagod	f2d5066dc7	fix some bugs	2017-01-19 11:37:59 +01:00
zmagod	27d3868f37	fix bugs	2017-01-19 09:40:39 +01:00
zmagod	65fa631b1c	adding tinyMce first run	2017-01-18 22:40:08 +01:00
Mojca Lorber	dde9854bf1	update protocol import/export and clone	2017-01-18 14:22:19 +01:00
Mojca Lorber	3b92ab9f36	add names to tables from protocol steps in reports	2017-01-18 14:22:19 +01:00
Mojca Lorber	b3c423c582	add table name in protocol step	2017-01-18 14:22:18 +01:00
Oleksii Kriuchykhin	a490a12fb1	Add truncation of image description in the preview [SCI-873]	2017-01-18 13:28:56 +01:00
Luka Murn	cf72da5635	Merge branch 'improved-files-handling' into 'master' Conflicts: app/assets/javascripts/protocols/steps.js.erb app/helpers/assets_helper.rb db/schema.rb	2017-01-18 11:29:40 +01:00
Zmago Devetak	1b9f7db385	Merge pull request #405 from ZmagoD/zd_SCI_832 Visualization of User smart annotation after saving the field	2017-01-18 09:36:42 +01:00
Luka Murn	a2935c6620	Add sample info modal popup to sample smart annotations This MR also loads datatables.js globally (as it's required by the modal), so I removed it everywhere in code, and it shouldn't be used anymore (e.g. '//= require datatables'). Closes SCI-892.	2017-01-16 15:52:02 +01:00
okriuchykhin	02bfd19d1c	Merge pull request #385 from okriuchykhin/ok_SCI_102 Fix XSS on activites and throghout the rest of app [SCI-102]	2017-01-16 11:41:38 +01:00
Luka Murn	1acf258c70	Fix minor Zmagohound comment	2017-01-14 10:00:52 +01:00
zmagod	1b2fa78e42	adds user preview to user smart annotation [fixes SCI-832]	2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin	75031e17b9	Remove double sanitization from views [SCI-102]	2017-01-12 16:54:15 +01:00
Luka Murn	bc03a26d4b	Also fix this new year issue on comments display	2017-01-12 15:06:12 +01:00
Luka Murn	8b01f912a0	Fix new year problems with activities Closes SCI-876.	2017-01-12 14:47:15 +01:00
Oleksii Kriuchykhin	0350f2f792	Add html escaping to name filelds in the views [SCI-102]	2017-01-12 11:03:14 +01:00
Oleksii Kriuchykhin	d05c16b0ba	Added auto_link wrapper with custom sanitization [SCI-102]	2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin	0546716a0b	Improve user input sanitization, fix bugs [SCI-102]	2017-01-11 15:50:11 +01:00
zmagod	3a1ec0eb5e	refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824]	2017-01-11 14:56:47 +01:00
Matej Zrimšek	30a9c283fb	Added back bullets to images in protocol preview in protocol repository.	2017-01-11 14:15:07 +01:00
Matej Zrimšek	852dc2eb7e	Added file downloading to protocol preview in protocol repository. [SCI-878]	2017-01-11 14:14:12 +01:00
zmagod	a4aa933151	refactor smart annotation parser helper	2017-01-11 10:34:14 +01:00
zmagod	a903772de8	style dropdown	2017-01-10 17:05:32 +01:00
zmagod	fc76a4ae6d	Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834	2017-01-10 14:22:04 +01:00
zmagod	89e8946a47	expand smart annotation	2017-01-10 14:14:21 +01:00
zmagod	e0e998a0d8	add smart annotation parser helper	2017-01-10 14:14:21 +01:00
zmagod	94262b56ef	prepare data for atwho	2017-01-10 14:14:21 +01:00
Oleksii Kriuchykhin	4c9c9037ed	Enable image preview after editing protocol and disable preview modal animation [SCI-868]	2017-01-09 17:19:46 +01:00
okriuchykhin	3f930ccfce	Merge pull request #392 from okriuchykhin/ok_SCI_858 Fixes wrong samples info modals being shown in samples datatable [SCI-858]	2017-01-09 12:49:38 +01:00
mz3944	ef431da2db	Merge pull request #389 from mz3944/mz-sci-848 Unable to delete samples [SCI-848]	2017-01-09 11:57:48 +01:00
mlorb	f14ad0f762	Merge pull request #387 from mlorb/ml_sci_732 Add protocol preview to search results [SCI-732]	2017-01-09 11:28:04 +01:00
Oleksii Kriuchykhin	bc8db28746	Fixes wrong samples info modals being shown in samples datatable [SCI-858]	2017-01-09 09:38:42 +01:00
Oleksii Kriuchykhin	aa2b573278	Enable image preview while editing steps and code style improvements [SCI-694]	2017-01-06 15:58:23 +01:00
Matej Zrimšek	ec7a1cb4c0	Replaced remaining related hard-coded names with constants and generalized delete samples name fetching. Minor refactoring. [SCI-848]	2017-01-06 14:23:20 +01:00
Luka Murn	7835753d3c	Add atwho-users URL to <body>	2017-01-06 12:48:37 +01:00
Mojca Lorber	aad2eadeae	syntax fix	2017-01-06 10:46:36 +01:00
Mojca Lorber	4e7e261225	fix protocol preview	2017-01-06 10:10:33 +01:00
Mojca Lorber	356edba1b3	add protocol preview to search results	2017-01-05 18:08:59 +01:00
Matej Zrimšek	4b0f47675a	Fixes experiment button not being clicable in project overview page. [SCI-849]	2017-01-05 14:42:52 +01:00
Oleksii Kriuchykhin	cd3924afd3	Sanitize .html_safe marked strings which contain tags [SCI-102]	2017-01-05 13:04:19 +01:00
Oleksii Kriuchykhin	9c4191a1e0	Initial code commit [SCI-102]	2017-01-05 13:04:19 +01:00
mlorb	59751ec41e	Merge pull request #373 from mlorb/ml_sci_709 Add Protocol Preview to Protocol repository [SCI-709]	2017-01-04 11:28:55 +01:00
Luka Murn	3bee9d2e12	Save an (yet unworking) version of user smart annotations Used so other devs can start working on smart annotations.	2017-01-04 10:54:02 +01:00
Luka Murn	6402acc102	Merge pull request #377 from Ducz0r/lm-sci-820-fix Fix 2 bugs with comments editing [SCI-820]	2017-01-04 10:47:29 +01:00
Luka Murn	37cd6417c8	Merge pull request #374 from Ducz0r/lm-sci-808-814-fix Fix some bugs on sample groups & types page [SCI-808, SCI-814]	2017-01-04 09:50:26 +01:00
Mojca Lorber	a0704cd873	remove duplicated includes of css and js	2017-01-03 17:33:01 +01:00
zmagod	a434649f42	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-01-03 16:35:25 +01:00
Mojca Lorber	e555535dfb	add edit button to protocol preview modal	2017-01-03 10:04:14 +01:00
okriuchykhin	68ac3486c7	Merge pull request #381 from okriuchykhin/ok_SCI_275 Add task name to project activity [SCI-275]	2016-12-30 15:32:08 +01:00
okriuchykhin	cce57d066c	Merge pull request #370 from okriuchykhin/ok_SCI_817 Fix issue with long samples column names in import modal [SCI-817]	2016-12-30 15:29:32 +01:00
okriuchykhin	e8955b0304	Merge pull request #375 from okriuchykhin/ok_SCI_361 Add sorting to Project's experiments overview [SCI-361]	2016-12-30 15:28:53 +01:00
Oleksii Kriuchykhin	f076226b3f	Add task name to project activity [SCI-275]	2016-12-29 16:31:48 +01:00
Oleksii Kriuchykhin	d798f1b120	Fix XSS vulnerability in protocol keywords [SCI-632]	2016-12-29 15:15:29 +01:00
Luka Murn	b931b20f02	Fix 2 bugs with comments editing Closes SCI-820.	2016-12-23 20:41:23 +01:00
Oleksii Kriuchykhin	4d3e002c81	Add sorting to Project's experiments overview [SCI-361]	2016-12-23 15:40:01 +01:00
Luka Murn	4b50c73474	Merge pull request #363 from Ducz0r/lm-sci-546-fix Restyle step table display in reports [SCI-546]	2016-12-23 12:57:54 +01:00
Luka Murn	3922be2b17	Change String in sample types & groups Closes SCI-808.	2016-12-23 11:48:57 +01:00
Mojca Lorber	40e3240a99	add content to preview modal	2016-12-22 11:43:11 +01:00
zmagod	e554fdf805	code refactor	2016-12-21 16:52:15 +01:00
Oleksii Kriuchykhin	53ea09c3de	Fix issue with long samples column names in import modal [SCI-817]	2016-12-21 14:34:53 +01:00
Oleksii Kriuchykhin	00ea3a027c	Fix generation of preview url for new steps and results [SCI-694]	2016-12-20 16:10:53 +01:00
Oleksii Kriuchykhin	cbef971d85	Fix timeouts when fetching images from S3 [SCI-694]	2016-12-20 15:36:07 +01:00
Oleksii Kriuchykhin	d2b76d8385	Improved image preview modal [SCI-694]	2016-12-19 17:36:18 +01:00
Luka Murn	a48eaf662e	Restyle step table display in reports so Closes SCI-546.	2016-12-19 15:09:49 +01:00
zmagod	efe41817f2	removes sample group/type link in new sample form [fixes SCI-809]	2016-12-19 10:49:21 +01:00
Oleksii Kriuchykhin	b537feb8a0	Added large preview [SCI-694]	2016-12-16 17:07:08 +01:00
Oleksii Kriuchykhin	8738b3e09d	Added image preview to Results [SCI-694]	2016-12-16 15:55:46 +01:00
Oleksii Kriuchykhin	0541253ffa	Added modal for images preview [SCI-694]	2016-12-16 15:53:16 +01:00
Zmago Devetak	c8631077df	Merge pull request #361 from biosistemika/improved-sample-table Improved sample table	2016-12-16 15:37:54 +01:00
zmagod	ba58ac2a77	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_781_796	2016-12-15 09:26:12 +01:00
zmagod	4d6a85ed7c	fixed sample groups colorpicker [fixes SCI-781]	2016-12-15 09:23:38 +01:00
zmagod	b07f9fae59	fixes new sample group/type link in sample row [fixes SCI-796]	2016-12-15 09:23:38 +01:00
zmagod	6d2fb3b02c	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790	2016-12-14 17:05:00 +01:00
okriuchykhin	c4ff12be51	Merge pull request #349 from okriuchykhin/ok_SCI_783 Fix columns ordering when deleting custom fields [SCI-783]	2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin	fa1cf1f04d	Better handling of columns deleting with fixing columns ordering [SCI-783]	2016-12-14 15:23:00 +01:00
zmagod	1ff98bb6df	adds tooltip to samples dropdown and column names	2016-12-14 13:36:10 +01:00
zmagod	9037ab3f48	fixed navigation link	2016-12-14 10:35:48 +01:00
Mojca Lorber	2cfcba0ceb	add protocol preview modal	2016-12-13 10:39:18 +01:00
zmagod	4b0e2baa3f	fixes breadcrumbs in secondary nav	2016-12-12 16:03:14 +01:00
zmagod	8dd8a7e7cd	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777	2016-12-12 15:52:25 +01:00
zmagod	5176f8b459	clean unneeded code [fixes SCI-778] refactor js	2016-12-12 15:40:13 +01:00
zmagod	d9025a9601	changes create/edit mode buttons [fixes SCI-777]	2016-12-12 14:42:06 +01:00
zmagod	8bb452e4f7	trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775]	2016-12-12 10:30:03 +01:00
zmagod	de3099e4d1	removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository	2016-12-09 13:59:49 +01:00
Luka Murn	1a8b141b95	Add delete custom field functionality	2016-12-09 13:49:19 +01:00
Luka Murn	da630ac2cb	Make edit, delete buttons clickable & hide them if neccesary	2016-12-09 13:18:59 +01:00
Mojca Lorber	0e3526c9ad	Merge branch 'mlorb-ml-sci-696' into improved-sample-table Conflicts: app/assets/javascripts/samples/sample_datatable.js	2016-12-08 15:44:50 +01:00
zmagod	40fdfef67f	setup delayed_paperclip gem	2016-12-08 15:24:14 +01:00
zmagod	ac52e643be	cleanup direct upload	2016-12-08 11:26:13 +01:00
okriuchykhin	cb2abfa7a9	Merge pull request #325 from okriuchykhin/ok_SCI_712 Added form for adding new columns to samples table into dropdown [SCI-712]	2016-12-06 15:00:01 +01:00
zmagod	dd85b128d2	fixed glyphicon-ok position	2016-12-06 14:47:16 +01:00
Oleksii Kriuchykhin	da7e86c7c2	Fix save/delete buttons after updating datatable and added permissions check [SCI-712]	2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin	f6dd64772a	Add columns to samples table without page reload [SCI-712]	2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin	40db8310fd	Move code to sample_datatable.js and removed unused modal [SCI-712]	2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin	22dabd2177	Added form for adding new columns to samples table into dropdown [SCI-712]	2016-12-06 13:17:05 +01:00
Oleksii Kriuchykhin	94866e8994	Initial code commit for samples columns dropdown [SCI-712]	2016-12-06 13:16:05 +01:00
zmagod	787b8b1600	fixed new sample type/group form	2016-12-06 12:01:02 +01:00
Mojca Lorber	849f78b4df	implement reordering of columns in the samples table and change from local to database storage	2016-12-05 11:34:36 +01:00
Zmago Devetak	a376118cd8	Merge pull request #334 from ZmagoD/zd_SCI_746 fixes bug with deleted team name	2016-12-05 10:47:39 +01:00
Zmago Devetak	91f29745c4	Merge pull request #314 from ZmagoD/zd_SCI_643 adds autolink	2016-12-05 10:47:23 +01:00
zmagod	6274cd413e	fixes bug with deleted team name [fixes SCI-746]	2016-12-02 16:07:00 +01:00
zmagod	7725374c42	refactor sample types/groups [fixes SCI-700]	2016-12-02 09:58:35 +01:00
zmagod	83aae59eed	adds sample groups index page	2016-12-02 09:33:09 +01:00
Luka Murn	6a770f6a7e	Fix inviting users not working Closes SCI-750, SCI-751. Probably reopens parts of SCI-746.	2016-12-01 15:46:37 +01:00
Luka Murn	c0a03d9f2d	Merge pull request #322 from Ducz0r/lm-add-show-version-var Add an environmental variable to toggle version display in navbar	2016-11-30 09:49:40 +01:00
Luka Murn	84d0cf4620	Use rails helpers as per @ZmagoD's request	2016-11-30 09:48:57 +01:00
Luka Murn	76ec77fce4	Merge pull request #329 from biosistemika/simplify-signup Merge simplify-signup into master	2016-11-30 09:41:20 +01:00
Luka Murn	d685ac939b	Merge pull request #326 from Ducz0r/lm-sci-746-fix Fix some recaptcha form submit errors for signup pages	2016-11-30 09:35:16 +01:00
zmagod	a2e13441e5	removes create_sample_type modal and related js actions	2016-11-30 09:02:34 +01:00
zmagod	4e4a48620c	adds validation to input fields	2016-11-29 18:08:29 +01:00
zmagod	12848f15fa	adds sample_type index view with all crud actions	2016-11-29 17:15:54 +01:00
Luka Murn	e099a279b1	Remove link to "Resend confirmation instructions" if not neccesary Closes SCI-747.	2016-11-29 16:12:35 +01:00
Luka Murn	b5d0a39827	Fix some recaptcha form submit errors for signup pages Closes SCI-746.	2016-11-29 15:53:58 +01:00
zmagod	5c0b2d7b24	init sample_types page	2016-11-29 08:57:12 +01:00
Zmago Devetak	1e870a6e7c	Merge pull request #320 from ZmagoD/zd_SCI_698 adds new samples columns dropdown [fixes SCI-698]	2016-11-28 16:30:16 +01:00
Luka Murn	9f998d6fed	Add an environmental variable to toggle version display in navbar The variable is called NAVBAR_SHOW_VERSION. If not specified, it defaults to the current behavior (version is hidden on production, but visible on development & test environments).	2016-11-28 10:52:17 +01:00
Luka Murn	d142fa96d9	Merge pull request #317 from Ducz0r/lm-sci-735-fix Add Deface hooks to sign up & confirm invitation forms	2016-11-28 10:22:46 +01:00
zmagod	9d91d2ce28	adds new samples columns dropdown [fixes SCI-698]	2016-11-25 17:29:30 +01:00
Luka Murn	a16bbe8fd2	Typo fix	2016-11-25 11:52:33 +01:00
Luka Murn	cb16ab3c75	Add Deface hooks to signup & confirm invitation forms	2016-11-25 11:50:20 +01:00
Oleksii Kriuchykhin	3fdb20b92c	Add full name field to accept invitation form [SCI-738]	2016-11-25 11:15:10 +01:00
Luka Murn	b1b095910c	Merge pull request #309 from Ducz0r/lm-remove-unused-files Brace for impact...	2016-11-25 10:00:29 +01:00
Oleksii Kriuchykhin	592ed802b2	Switched to use of recaptcha_input_tag helper method [SCI-706]	2016-11-24 14:19:44 +01:00
Oleksii Kriuchykhin	698e07a3b5	Enable reCaptcha and auto log in on confirm invitation form [SCI-706]	2016-11-24 14:11:02 +01:00
Mojca Lorber	beae54e278	remove already_authenticated alert flash	2016-11-23 14:55:41 +01:00
zmagod	32eea3dbdd	adds autolink to result comments	2016-11-23 14:24:51 +01:00
zmagod	fafecce264	adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]	2016-11-23 14:18:50 +01:00
Mojca Lorber	48ac289b6e	put recaptcha in helper method	2016-11-22 17:57:42 +01:00
Mojca Lorber	60f23b109b	integrate reCaptcha into sciNote	2016-11-22 14:57:41 +01:00
mz3944	c5bc3a4dc6	Merge pull request #303 from mz3944/mz_and_new_tutorial_steps_SCI_571_v2 Added additional tutorial step for showing protocol link. Tutorial st…	2016-11-21 16:06:45 +01:00
Luka Murn	59eb1c1d18	Remove unused new, edit user_projects views	2016-11-19 17:01:10 +01:00
Luka Murn	911b7ba72f	Remove unused new user_my_module view	2016-11-19 16:59:24 +01:00
Luka Murn	008b31df0c	Finish removing new comment forms	2016-11-19 16:54:55 +01:00
Luka Murn	595b213b1a	Changes up to samples in views folder	2016-11-19 16:51:40 +01:00
Mojca Lorber	086f937fbb	fix empty space and blockquote padding - rich text editing	2016-11-18 12:43:57 +01:00
Matej Zrimšek	f13cc5be0e	Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).	2016-11-17 18:03:49 +01:00
Luka Murn	26d04b1f3c	Merge branch 'rich-text-formatting' into 'master' Conflicts: Gemfile.lock app/assets/stylesheets/themes/scinote.scss	2016-11-17 16:39:33 +01:00
Luka Murn	9d3685f872	Merge branch 'gamification' into 'master' Conflicts: app/controllers/users/invitations_controller.rb app/controllers/users/settings_controller.rb	2016-11-17 16:30:18 +01:00
Matej Zrimšek	c8eb82cc85	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	c64146904a	Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count.	2016-11-17 14:46:04 +01:00
Luka Murn	d1701bd7ae	Merge pull request #276 from Ducz0r/lm-sci-637 Automatically resize textarea elements [SCI-637]	2016-11-17 09:58:36 +01:00
zmagod	da54d779ec	Merge branch 'rich-text-formatting' of https://github.com/biosistemika/scinote-web into zd_SCI_687	2016-11-17 08:48:40 +01:00
Luka Murn	a3bbf94643	Add a smart_text_area tag & implement it throughout application This fixes the mentioned issues @mlorb mentioned. Closes SCI-637.	2016-11-16 17:57:01 +01:00
Luka Murn	aadcdde417	Merge pull request #294 from Ducz0r/lm-sci-674-fix Import protocol steps' rich text styling when importing protocols [SCI-674]	2016-11-16 16:59:18 +01:00
Oleksii Kriuchykhin	d2e29935cf	Improved tutorial styling [SCI-685]	2016-11-16 15:44:06 +01:00
zmagod	b781db9667	fixed bullets	2016-11-16 15:30:14 +01:00
Zmago Devetak	d3234bc52f	Merge pull request #284 from biosistemika/zd_SCI_662 fixes description label [fixes SCI-662]	2016-11-16 14:16:57 +01:00
zmagod	7953372d83	add description label	2016-11-16 13:59:35 +01:00
Luka Murn	83160a487b	Fix importer so it supports rendering & importing rich text format Closes SCI-674.	2016-11-15 16:57:53 +01:00
Luka Murn	04749c3b2c	Allow inviting of existing, unconfirmed users Closes SCI-676.	2016-11-15 15:04:31 +01:00
Mojca Lorber	c089832909	add validation for result text field	2016-11-15 12:55:32 +01:00
okriuchykhin	01b01939f3	Merge pull request #277 from okriuchykhin/ok_SCI_571 Additional steps added to tutorial and numbering of the steps fixed [SCI-571]	2016-11-15 12:05:20 +01:00
Mojca Lorber	607f1381d0	fix mobile view	2016-11-15 10:58:15 +01:00
Mojca Lorber	6afc5c5a4b	fix position of buttons in text result	2016-11-14 16:31:48 +01:00
zmagod	67c508a891	fixes description label [fixes SCI-662]	2016-11-14 13:47:20 +01:00
Oleksii Kriuchykhin	2fb3041784	Fixes edit avatar link area [SCI-649]	2016-11-11 13:17:44 +01:00
mlorb	b0b2484fdf	Merge pull request #279 from mlorb/ml_sci_638_vol2 Fix validation problems for rich text fields [SCI-638]	2016-11-11 12:37:02 +01:00
mlorb	1ca452db7b	Merge pull request #273 from mlorb/ml_sci_640 Add rich text formatting on results and remove markdown [SCI-640]	2016-11-11 12:06:13 +01:00
mlorb	d42adff77e	Merge pull request #275 from mlorb/ml_sci_642 Add formatted text in reports [SCI-642]	2016-11-11 12:04:19 +01:00
Oleksii Kriuchykhin	b9f982ead7	Additional steps added to tutorial and numbering of the steps fixed [SCI-571]	2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin	d2491a18a4	Tutorial Save Protocol step added [SCI-571]	2016-11-11 10:06:18 +01:00
Luka Murn	b42922d32c	Add autosize functionality to all textareas Closes SCI-637	2016-11-11 09:09:41 +01:00
Luka Murn	acd8ce8932	Merge pull request #270 from Ducz0r/lm-sci-644 Convert all large text input fields into text areas (10000 characters)	2016-11-11 09:07:25 +01:00
Mojca Lorber	1facd2cefe	fix validation problems	2016-11-10 17:20:17 +01:00
Mojca Lorber	fbaffbcaab	add formatted text in reports	2016-11-10 15:20:40 +01:00
Mojca Lorber	3e162b3a93	remove redcarpet gem - markdown	2016-11-10 14:11:32 +01:00
Mojca Lorber	456c6d1ad6	Copy rich text functionality to text results	2016-11-10 12:19:59 +01:00
Mojca Lorber	ab0879e8d6	Integrate library with default settings	2016-11-09 13:09:53 +01:00
Luka Murn	c88f834ba9	Merge pull request #269 from Ducz0r/lm-sci-569 Add a refactored invite users modal that can be reused throughout application	2016-11-08 16:57:05 +01:00
Luka Murn	b246853117	Code styling (use link_to, %w)	2016-11-08 16:43:25 +01:00
Zmago Devetak	82a12f0fce	Merge pull request #262 from ZmagoD/zd_add_notification_types_to_constants Enables notifications to be extended	2016-11-08 13:08:15 +01:00
Luka Murn	d44a757b25	Add textareas to checklist name & items Closes SCI-644	2016-11-08 11:50:29 +01:00
Luka Murn	55d8fea359	Make all comment edit fields textareas	2016-11-08 11:29:55 +01:00
Luka Murn	9438ba7e10	Fix a bug	2016-11-08 09:00:00 +01:00
Luka Murn	9260ed31f3	Add Deface hooks to main navbar	2016-11-07 16:57:18 +01:00
Luka Murn	0ab62576a2	Add new modal to organization page, remove old modal code	2016-11-07 09:43:10 +01:00
Luka Murn	a188984ede	Allow strings of modal to be replaced	2016-11-07 09:43:10 +01:00
Luka Murn	6fe0d6b3df	A working invite modal!	2016-11-07 09:43:10 +01:00
Luka Murn	ccf8932611	Add first version of invite users modal	2016-11-07 09:43:09 +01:00
Matej Zrimšek	0fe5822825	Added profile statistics data hook.	2016-11-03 17:50:32 +01:00
Mojca Lorber	a234c4c9d9	fix merge conflict problem with avatar on profile page	2016-11-03 15:23:09 +01:00
zmagod	1d6b93829c	added hooks in notifications preview	2016-11-03 14:48:01 +01:00
Mojca Lorber	44b51d087a	merging	2016-11-02 14:06:20 +01:00
Zmago Devetak	6e022699eb	Merge pull request #256 from ZmagoD/add_getting_started_flash_hook Added getting started hoot to layout/application.html	2016-10-28 16:19:20 +02:00
zmagod	01b27e9e6d	added getting started hoot to layout/application.html	2016-10-28 10:36:15 +02:00
Mojca Lorber	91ec201fd0	make image clickable	2016-10-27 16:18:31 +02:00
Oleksii Kriuchykhin	d28edfb488	Added statistics block in users profile [SCI-566]	2016-10-27 13:44:27 +02:00
Mojca Lorber	8309df0aaf	fix hound	2016-10-26 13:51:05 +02:00
Mojca Lorber	878952f072	change edit avatar in profile	2016-10-26 13:41:17 +02:00
zmagod	24b81c96f6	sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608]	2016-10-24 21:20:41 +02:00
Luka Murn	b13fd22408	Add back the release notes URL to navbar Closes SCI-604	2016-10-24 16:59:32 +02:00
Zmago Devetak	12c77df883	Merge pull request #237 from ZmagoD/zd_SCI_593_v2 Styled global team switch and search [fixes SCI-593]	2016-10-21 16:28:50 +02:00
Luka Murn	388e092bbf	Merge pull request #238 from Ducz0r/lm-sci-596-fix SCI-596 fix	2016-10-21 11:59:01 +02:00
zmagod	49d3879642	fixes padding on mobile, added separator on team switch dropdown, focus search input	2016-10-21 11:46:59 +02:00
Zmago Devetak	4f5b7ad8ad	Merge pull request #228 from ZmagoD/zd_SCI_585 Removes archived projects from index page [fixes SCI-585]	2016-10-21 11:33:01 +02:00
Luka Murn	7b825a217f	Closes SCI-596	2016-10-21 11:08:47 +02:00
zmagod	c642e208dd	styled global team switch and search [fixes SCI-593]	2016-10-21 09:33:18 +02:00
zmagod	db806f3c10	hide private projects	2016-10-21 09:06:19 +02:00
Zmago Devetak	f615b3da41	Merge pull request #230 from ZmagoD/zd_SCI_586 Adds new team button to team switch dropdown [fixes SCI-586]	2016-10-21 08:29:05 +02:00
zmagod	f21c9e394f	adds new team button to team switch dropdown [fixes SCI-586]	2016-10-20 13:47:41 +02:00
zmagod	4c086a6fc1	removes archived projects from index page [fixes SCI-585]	2016-10-20 13:13:44 +02:00
zmagod	8aaf58f75f	removes org selector form project archive [fixes SCI-587]	2016-10-20 12:50:55 +02:00
Luka Murn	640a575a3a	Merge pull request #222 from biosistemika/modular-tasks Merge global team switch into master	2016-10-18 11:39:09 +02:00
zmagod	54a3237994	displays org name on the project index page if no project	2016-10-17 15:21:19 +02:00
zmagod	8a6899aeea	restyled team switch dropdown	2016-10-17 15:21:19 +02:00
zmagod	a116feac9c	fixed typos and added truncation to org name	2016-10-17 15:21:19 +02:00
zmagod	1614cbc2b2	fixes repeat tutorial button and localization typos	2016-10-17 15:16:22 +02:00
zmagod	fa36488397	fixed new project form	2016-10-17 15:10:26 +02:00
zmagod	8f24d0d80c	fixed new user registration	2016-10-17 15:10:26 +02:00
zmagod	bb9c03df24	fixes controllers	2016-10-17 15:10:26 +02:00
zmagod	d7f514db09	fixes search	2016-10-17 15:10:26 +02:00
zmagod	efe031d766	setup current_organization in all controllers	2016-10-17 15:10:26 +02:00
zmagod	d86a4dd311	setup global team switch view and controller action	2016-10-17 15:10:26 +02:00
Oleksii Kriuchykhin	0ec7c019b3	Fix issue with pop-up windows and turbolinks [SCI-463]	2016-10-17 14:25:54 +02:00
Matej Zrimšek	a6a2a237aa	Removed unneeded ERB tags, which caused error. Minor refactoring.	2016-10-17 11:57:47 +02:00
Matej Zrimšek	ece89da391	Removed ruby constants duplicates in JS, because of caching problems.	2016-10-17 11:57:47 +02:00
Matej Zrimšek	778ed8814b	Removed some unneeded code.	2016-10-17 11:57:46 +02:00
Matej Zrimšek	0780bd2416	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
Matej Zrimšek	a3dfb59558	Added remaining constants.	2016-10-17 11:30:05 +02:00
Matej Zrimšek	21ec05d541	Refactored searches (user and globals earch) and used constants.	2016-10-17 11:17:59 +02:00
Luka Murn	02d3e03f75	Bugfix for notification emails The URLs in notification emails didn't get server URL prepended, so users could not click on them.	2016-10-13 12:12:28 +02:00
mlorb	78f7879c04	Merge pull request #216 from mlorb/ml_sci_555 Adding update notifications in settings [SCI-555]	2016-10-13 08:53:55 +02:00
Mojca Lorber	8f783f87f7	fixes hound	2016-10-12 15:32:40 +02:00
Mojca Lorber	42f6b679f8	Adding system notifications email function in settings	2016-10-12 11:50:26 +02:00
Mojca Lorber	6bea0a9e1a	fixes merge conflicts	2016-10-12 10:55:40 +02:00
Luka Murn	cccabcdd7b	Remove invitation_to_organization email This email is no longer needed, because if user enables assignment notifications, he/she will already receive an email whenever he/she is added to a new organization/team (via notifications email).	2016-10-12 10:54:36 +02:00
Mojca Lorber	4f1cbad7da	adding update notifications in settings	2016-10-12 10:42:07 +02:00
Zmago Devetak	f25767fdc3	Merge pull request #209 from ZmagoD/zd_SCI_534_remove_popup Removed introductory popup [fixes SCI-534]	2016-10-12 08:13:46 +02:00
Zmago Devetak	b225dc1e29	Merge pull request #210 from ZmagoD/zd_SCI_548_protocol_steps_not_visible Fixes protocol steps [fixes SCI-548]	2016-10-12 08:13:28 +02:00
Oleksii Kriuchykhin	4c6a60c249	Added html_safe to notification email template	2016-10-11 16:46:20 +02:00
Oleksii Kriuchykhin	90c853743c	Additional fixes to email markup and logic [SCI-443]	2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin	5399033fce	Added user settings for email notifications [SCI-443]	2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin	8dc956010c	Initial code commit [SCI-443]	2016-10-11 16:43:17 +02:00
zmagod	ea305b356a	fixes protocol steps [fixes SCI-548]	2016-10-11 09:10:12 +02:00
zmagod	42a30576e3	removed introductory popup [fixes SCI-534]	2016-10-11 08:33:50 +02:00
Luka Murn	448daab7c8	Merge pull request #207 from biosistemika/add-deface-hotfix Merge hotfix 1.3.1 into master	2016-10-07 18:26:13 +02:00
zmagod	32f03ec94c	Add Deface hooks	2016-10-06 16:47:36 +02:00
zmagod	de00a19dd9	fixes styling in settings preferences [SCI-553]	2016-10-06 13:22:44 +02:00
zmagod	5b3889c172	notification index images [fixes SCI-554]	2016-10-06 12:09:01 +02:00
Luka Murn	5c80c8a817	Add "no notifications" to dropdown & notifications index page	2016-10-05 16:58:21 +02:00
Luka Murn	877574e853	Add link to settings from both notification lists	2016-10-05 16:26:26 +02:00
Oleksii Kriuchykhin	083a09c2f7	Add link to notifications index page	2016-10-05 16:13:05 +02:00
okriuchykhin	50f28fe883	Merge pull request #193 from okriuchykhin/ok_global_notifications-SCI-442 Global notifications screen [SCI-442]	2016-10-05 16:01:41 +02:00
Oleksii Kriuchykhin	4e2ad1d5e6	Fix the issues after code review [SCI-442]	2016-10-05 15:54:31 +02:00
Oleksii Kriuchykhin	246dae4f46	Code style improvements according to hound [SCI-442]	2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin	8907e54b49	Global notifications index page added [SCI-442]	2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin	8b5b0723d1	Initial code commit	2016-10-05 15:51:11 +02:00
Zmago Devetak	f3708bcac0	Merge pull request #191 from ZmagoD/zd_SCI_469_ver2 Comments date duplication	2016-10-05 15:47:42 +02:00
Zmago Devetak	eea310514a	Merge pull request #194 from ZmagoD/zd_SCI_531_533 Notification style fixes	2016-10-05 15:27:36 +02:00
Zmago Devetak	71ad5bf034	Merge pull request #190 from ZmagoD/zd_SCI_529 Prepare settings screen for notifications	2016-10-05 14:54:47 +02:00
zmagod	9c7a690944	fixed type, fixed settings controller, fixes setting view on mobile devices	2016-10-05 14:33:22 +02:00
zmagod	5bf278298b	fixed navbar on sceens smaller than 1000px	2016-10-05 12:22:27 +02:00
zmagod	d7a4f85ba1	added links to notification project name and task	2016-10-05 09:40:44 +02:00
Jure Grabnar	62356c36a1	Add file extension to global search	2016-10-04 19:04:08 +02:00
zmagod	6229e6a3a1	styled notification settings button [fixes SCI-529]	2016-10-04 16:12:56 +02:00
zmagod	a68e7abc57	first run notification settings	2016-10-04 15:52:48 +02:00

... 14 15 16 17 18 ...

1803 commits