Commit graph

94 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
8ec643c54b Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301] 2018-05-09 18:03:16 +02:00
zmagod
0b721d86b1 adds new string truncation method [fixes SCI-2344] 2018-05-03 14:24:23 +02:00
Luka Murn
68caf56ec2 Add comment to constants 2018-04-20 12:31:22 +02:00
Luka Murn
21e7e7057e Refactor all the methods into two new services 2018-04-20 12:31:22 +02:00
Luka Murn
5e2622ecfc Change default repository state to Ruby representation
Also remove some dead code from repositories datatables
2018-04-20 12:31:22 +02:00
Zmago Devetak
93fc1af12d
Merge pull request #1083 from ZmagoD/zd_SCI_2259
set limit on maximum number of dropdown list items [fixes SCI-2259]
2018-04-19 17:17:54 +02:00
mlorb
04a20ab7ec change links 2018-04-16 17:05:22 +02:00
zmagod
b12f6f1b92 set limit on maximum number of dropdown list items [fixes SCI-2259] 2018-04-09 12:50:25 +02:00
zmagod
cf7761daaa Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223 2018-04-06 12:56:39 +02:00
zmagod
e630d3113f add ID column to repository [fixes SCI-2206] 2018-04-04 11:55:11 +02:00
mlorb
e5e92eb215 fix the rest of the constants 2018-04-03 10:28:39 +02:00
Oleksii Kriuchykhin
51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +02:00
mlorb
22afa61b11 refactor colors 2018-03-28 13:54:01 +02:00
mlorb
faaecec2ff implement new Help dropup in navigation 2018-03-23 14:08:27 +01:00
zmagod
4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00
zmagod
e69e9f6794 remove unneeded comment and add tiny_mce_asset regex in a constant 2017-11-24 17:04:01 +01:00
Luka Murn
16e672b9d8 Add VERSION file where the sciNote Core version is stored 2017-07-10 09:26:35 +02:00
Luka Murn
9a19cb711f Version bump to 1.12.1 2017-07-04 08:00:32 +02:00
Zmago Devetak
d726c121bc Version bump to 1.12.0 2017-06-23 12:37:19 +02:00
Mojca Lorber
51c4eeb106 renaming 2017-06-06 15:50:43 +02:00
Mojca Lorber
13bf4ad229 create new repository 2017-06-06 09:54:39 +02:00
Luka Murn
4c5d7267ac Version bump to 1.11.0 2017-05-18 13:48:02 +02:00
zmagod
80a0af8c9f replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241] 2017-05-11 11:36:47 +02:00
Matej Zrimšek
2c76ba9471 Added date format constant. [Fixes SCI-1205] 2017-04-25 16:37:09 +02:00
Luka Murn
61af70668c Bump version to 1.10.0 2017-04-19 09:31:40 +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
Luka Murn
d8c00401cd Update constants.rb
Bump version to 1.9.1
2017-04-11 09:10:55 +02:00
zmagod
9610c5f5a0 fix info dropdown links [fixes SCI-1141] 2017-04-07 11:31:09 +02:00
zmagod
e016bda9d2 adds expired days in constant 2017-04-04 10:16:54 +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
6a4faf8765 add color constants 2017-03-31 13:24:08 +02:00
Luka Murn
541998bde6 Bump version to 1.9.0 2017-03-23 14:37:47 +01:00
Luka Murn
98e2a56670 Bump version to 1.8.1 2017-02-23 14:00:46 +01:00
Luka Murn
52ab6d096f Version bump to 1.8.0 2017-02-23 11:15: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
Luka Murn
50b8588cbf Version bump to 1.7.2 2017-01-31 15:49:58 +01:00
Luka Murn
db75231617 Update URLs to sciNote support pages
Closes SCI-978.
2017-01-31 15:48:56 +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
b2d2f56bdd Version bump to 1.7.1 2017-01-26 17:00:54 +01:00
Luka Murn
042a85af45 Bump version to 1.7.0 2017-01-25 18:22:11 +01:00
Mojca Lorber
d669f006b1 fix tables in reports 2017-01-25 15:15:26 +01:00
zmagod
f04a2f663a renamed organizations in config/ 2017-01-25 12:30:11 +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
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
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
Oleksii Kriuchykhin
0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +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
Oleksii Kriuchykhin
4fe3030ad4 Freeze WHITELISTED_ATTRIBUTES constatnt [SCI-102] 2017-01-05 16:13:00 +01:00
Oleksii Kriuchykhin
1009347026 Add list of whitelisted attributes [SCI-102] 2017-01-05 15:33:41 +01:00
Luka Murn
ef688feb4e Hotfix 1.6.1
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
2017-01-05 15:27:18 +01:00