342 commits

Author	SHA1	Message	Date
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	23d3ffa5a4	Fixed PR	2017-11-12 15:48:45 +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
Zanz2	9086cd8b6b	Jira branch code	2017-11-09 10:49:44 +01:00
zmagod	f43492adff	trigger an alert to on canvas save if page reload [fixes SCI-1610]	2017-11-07 15:08:26 +01:00
mlorb	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	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
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
Luka Murn	8cda449738	Update en.yml ... Remove unneccesary my_module_groups localization Strings.	2017-10-23 17:49:55 +02:00
Zanz2	03e40017e4	Updated local	2017-10-19 19:58:18 +02:00
Zanz2	6cf775a4b1	Refactored code, made html render on preview too	2017-10-17 19:27:20 +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
Luka Murn	38bce08b5a	Minor wording change.	2017-10-13 09:27:18 +02:00
Luka Murn	fe89b942e7	Add Add-ons page to User -> Settings -> Account ... Closes SCI-1675.	2017-10-11 14:15:37 +02:00
Zanz2	183c93d21b	Refactoring to git review specifications	2017-10-07 22:13:31 +02:00
Zanz2	2b9563ec6d	Added preview text to en.yml	2017-10-07 17:45:23 +02:00
Zanz2	66e5004e60	Changed import text to be inside en.yml, as said in the code review, deleted some blank lines	2017-10-07 15:56:43 +02:00
Oleksii Kriuchykhin	b26b963e54	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +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	d6d1f9d490	changed second modal preview styling to fit its specifications	2017-09-14 11:46:41 +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
Žan Žagar	fdbae19156	changed .json to .txt for clarity	2017-09-12 09:33:18 +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	2c0a458aaf	dodav moj alternativni text za importanje (text na gumbu), za rails translate (t)	2017-09-11 15:21:35 +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
Oleksii Kriuchykhin	ece27b2652	Fix importing files with empty header cells and error messages improvements [SCI-1484]	2017-07-18 14:54:35 +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
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	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
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
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
Matej Zrimšek	be855e98db	Changed repository records filter naming. [SCI-1398]	2017-06-23 10:16:50 +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
Mojca Lorber	86530bbda0	fix flash text	2017-06-16 14:41:50 +02:00
Mojca Lorber	4566fc7191	fix text in activity for assign/unassign records message	2017-06-15 10:06:12 +02:00
Mojca Lorber	77d922a5e8	change the name of add record/repository in repositories	2017-06-13 09:45:18 +02:00
zmagod	a865253a2e	first run	2017-06-13 08:10:10 +02:00