Urban Rotnik
|
bf6041e13d
|
Update sanitization of html descriptions
|
2019-06-19 11:05:22 +02:00 |
|
Urban Rotnik
|
c691ad80b5
|
Add fields to query params for ApiClient
|
2019-06-17 12:24:16 +02:00 |
|
Urban Rotnik
|
7fad5fc594
|
Add search service and normalizer for list
|
2019-06-17 12:24:15 +02:00 |
|
Urban Rotnik
|
a15596a126
|
Add ImportProtocolService
|
2019-06-17 12:24:10 +02:00 |
|
Urban Rotnik
|
aadf2eecb4
|
Basic data normalizer for ProtocolIO
|
2019-06-17 12:24:08 +02:00 |
|
Jure Grabnar
|
c1cee07a63
|
Extract API client constants to constants.rb
|
2019-06-17 12:24:08 +02:00 |
|
aignatov-bio
|
52a2f5cd0e
|
Add recent protocols dropdown to task page [SCI-3417] (#1800)
* Add recent protocols dropdown to task page
|
2019-06-13 15:47:29 +02:00 |
|
Oleksii Kriuchykhin
|
e543a849d4
|
Add document file preview generation with LibreOffice [SCI-3145]
|
2019-06-05 14:52:30 +02:00 |
|
aignatov-bio
|
2de2ead723
|
Refactor avatar image appearance across Scinote [SCI-3482] (#1787)
* Refactor avatar appearance across Scinote
|
2019-05-21 15:19:44 +02:00 |
|
Luka Murn
|
890df8803e
|
Add file name validation to create new Office file modal window
|
2019-05-10 18:19:32 +02:00 |
|
aignatov-bio
|
dc7fddc60a
|
Improve task tags (#1708)
|
2019-04-26 15:38:33 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
aignatov-bio
|
6b45dcd475
|
Update eln export for new tinyMCE image format (#1680)
|
2019-04-19 14:44:40 +02:00 |
|
Oleksii Kriuchykhin
|
9e91e9e59d
|
Improve large image saving after editing [SCI-3289]
|
2019-04-03 16:31:56 +02:00 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +01:00 |
|
aignatov-bio
|
6eae12efab
|
Updating permission check for image editing [SCI - 3153, 3159] (#1568)
*Add permission check for assets editing
* Add check for image format
|
2019-03-19 13:52:57 +01:00 |
|
Oleksii Kriuchykhin
|
0c99ea9c5c
|
Fix local storage file download links [SCI-3048]
|
2019-03-07 16:46:05 +01:00 |
|
Oleksii Kriuchykhin
|
bd2efa55ac
|
Add templates business logic [SCI-2939]
|
2019-01-25 10:55:08 +01:00 |
|
Oleksii Kriuchykhin
|
2769add4d9
|
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2018-12-31 18:10:12 +01:00 |
|
Oleksii Kriuchykhin
|
8d0dbc7076
|
Add time format selection to settings [SCI-2778]
|
2018-11-09 16:19:40 +01:00 |
|
Matej Zrimšek
|
17380ba0ca
|
Refactoring rebased code [SCI-2641]
|
2018-10-15 01:12:25 +02:00 |
|
Matej Zrimšek
|
aa30cf6130
|
Refactor StringUtility#to_filesystems_compatible_filename [SCI-2641]
|
2018-10-12 07:40:22 +02:00 |
|
Matej Zrimšek
|
7152d2f0f1
|
Fix/update file naming convection for exported files [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
zmagod
|
db1944cc90
|
move maximum file size limit to an ENV variable [fixes SCI-2415]
|
2018-06-19 14:15:14 +02:00 |
|
Luka Murn
|
9a4fdd166e
|
Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix
Conflicts:
app/views/projects/index.html.erb
|
2018-06-12 17:44:42 +02:00 |
|
Zmago Devetak
|
74ccaf06b9
|
Merge pull request #1184 from ZmagoD/zd_SCI_2417
adds asset_text_data to global search options
|
2018-06-08 14:30:52 +02:00 |
|
Luka Murn
|
b324a2dab3
|
Restyle activities page
|
2018-06-07 09:29:47 +02:00 |
|
zmagod
|
9abf50e7c5
|
Limits the max. amount of rows when importing into inventories [fixes SCI-2468]
|
2018-05-31 10:45:31 +02:00 |
|
zmagod
|
3da098cb60
|
fixes the issue with extraction of text from file [fixes SCI-2417]
|
2018-05-31 09:42:57 +02:00 |
|
zmagod
|
e0908fb85f
|
adds asset_text_data to global search options
|
2018-05-30 18:18:09 +02:00 |
|
Luka Murn
|
f8c8887d72
|
Forgot to remove the constant
|
2018-05-27 17:23:50 +02:00 |
|
Luka Murn
|
b86edf20a5
|
Remove auto-toggling of navigation sidebar depending on width
|
2018-05-27 15:44:15 +02:00 |
|
Luka Murn
|
dac44acf2a
|
Rename sciNote -> SciNote (config/ folder)
|
2018-05-21 15:11:12 +02:00 |
|
Luka Murn
|
10cd494936
|
Update WEBINARS_URL
|
2018-05-15 15:58:35 +02:00 |
|
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 |
|
Oleksii Kriuchykhin
|
6487bd788a
|
Add additional whitelisted tags [SCI-102]
|
2017-01-05 14:40:38 +01:00 |
|
Oleksii Kriuchykhin
|
9c4191a1e0
|
Initial code commit [SCI-102]
|
2017-01-05 13:04:19 +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
|
e16c826bb1
|
Version bump to 1.6.0
|
2016-12-22 11:43:52 +01:00 |
|
Oleksii Kriuchykhin
|
b537feb8a0
|
Added large preview [SCI-694]
|
2016-12-16 17:07:08 +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
|
2426539715
|
fixes long names in columns dropdown [fixes SCI-784]
|
2016-12-13 14:54:37 +01:00 |
|
zmagod
|
ac52e643be
|
cleanup direct upload
|
2016-12-08 11:26:13 +01:00 |
|
Luka Murn
|
7309da9d92
|
Version bump to 1.5.1
|
2016-12-01 15:54:08 +01:00 |
|
okriuchykhin
|
f9c8223fe5
|
Merge pull request #321 from okriuchykhin/ok_SCI_736
Improve regexp for image whitelisting [SCI-736]
|
2016-11-28 15:46:54 +01:00 |
|
Oleksii Kriuchykhin
|
d8f8e01a46
|
Code cleanup, added new image types to whitelist [SCI-736]
|
2016-11-28 11:13:20 +01:00 |
|
okriuchykhin
|
31f6379866
|
Merge pull request #318 from okriuchykhin/ok_SCI_736
Add whitelisting of supported image types [SCI-736]
|
2016-11-28 09:32:49 +01:00 |
|
Luka Murn
|
d0b86de3a4
|
Use Rails's email regex
|
2016-11-25 17:37:27 +01:00 |
|
Oleksii Kriuchykhin
|
74f6455a8f
|
Add whitelisting of supported image types [SCI-736]
|
2016-11-25 16:12:43 +01:00 |
|
Luka Murn
|
91ffb232e2
|
Version bump to 1.5.0
|
2016-11-24 11:37:45 +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 |
|