zmagod
|
bd1345d560
|
fixes bug with assets upload on task result page,
adds ctrl+v listener to upload images from clipboard, adds image preview modal
|
2018-02-06 15:39:19 +01:00 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
Oleksii Kriuchykhin
|
959eddacda
|
Clear selected rows when changing pages on samples table[SCI-1329]
|
2018-01-18 17:41:35 +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 |
|
Zmago Devetak
|
b9e56c49ef
|
Merge pull request #944 from ZmagoD/zd_SCI_1938
fixes bug with comment actions dropdown [fixes SCI-1938]
|
2018-01-17 13:42:36 +01:00 |
|
zmagod
|
5371f5a139
|
fixes bug with comment actions dropdown [fixes SCI-1938]
|
2018-01-17 12:54:21 +01:00 |
|
Oleksii Kriuchykhin
|
74a62c41eb
|
Fix task repository row selector [SCI-1940]
|
2018-01-17 11:21:41 +01:00 |
|
Oleksii Kriuchykhin
|
deabd39a98
|
Fix protocol import button [SCI-1931]
|
2018-01-15 13:43:09 +01:00 |
|
Zmago Devetak
|
4e4cae9a48
|
Merge pull request #927 from ZmagoD/zd_SCI_1867
fix import protocol preview [fixes SCI-1867]
|
2018-01-08 14:21:44 +01:00 |
|
zmagod
|
7af4816ce8
|
removes js brakepoint
|
2018-01-05 17:13:39 +01:00 |
|
zmagod
|
3fae267547
|
fix import protocol preview [fixes SCI-1867]
|
2018-01-05 15:30:11 +01:00 |
|
zmagod
|
862b73cae7
|
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866
|
2018-01-05 09:13:43 +01:00 |
|
zmagod
|
0d72851bb5
|
fixes bug with displaying assign/unassign button [fixes SCI-1870]
|
2018-01-04 17:20:17 +01:00 |
|
okriuchykhin
|
3d3b1d3a44
|
Merge pull request #921 from okriuchykhin/ok_SCI_1648
Fix assign repository record button in tasks when one record is selected [SCI-1648]
|
2018-01-03 16:28:34 +01:00 |
|
zmagod
|
1d3881b649
|
fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]
|
2018-01-03 13:48:59 +01:00 |
|
Oleksii Kriuchykhin
|
89230bd730
|
Fix about modal [SCI-1875]
|
2017-12-22 18:27:20 +01:00 |
|
Oleksii Kriuchykhin
|
27008be50e
|
Fix assign repository record button in tasks when one record is selected [SCI-1648]
|
2017-12-22 18:05:22 +01:00 |
|
okriuchykhin
|
0a6d0d1a47
|
Merge pull request #918 from okriuchykhin/ok_SCI_1893
Fix invite users dropdown [SCI-1893]
|
2017-12-22 16:58:49 +01:00 |
|
Oleksii Kriuchykhin
|
917c2cf28e
|
Fix experiment workflow image update indicator [SCI-1872]
|
2017-12-22 13:12:52 +01:00 |
|
Oleksii Kriuchykhin
|
afb579bef1
|
Fix invite users dropdown [SCI-1893]
|
2017-12-21 16:49:10 +01:00 |
|
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 |
|
Oleksii Kriuchykhin
|
373d7e8aa6
|
Clear selected files after successful upload [SCI-1747]
|
2017-12-01 11:51:22 +01:00 |
|
Oleksii Kriuchykhin
|
c4fe2b1c11
|
Fix jsPlumb library loading [SCI-1839]
|
2017-12-01 10:48:07 +01:00 |
|
Oleksii Kriuchykhin
|
745dac09a7
|
Improve clean-up of dropped files [SCI-1747]
|
2017-11-28 16:48:47 +01:00 |
|
Oleksii Kriuchykhin
|
6964ed2dbb
|
Add initialization of the selectpicker on experiments actions [SCI-1840]
|
2017-11-28 16:34:30 +01:00 |
|
Oleksii Kriuchykhin
|
e35031dd9a
|
Small code fixies [SCI-1747]
|
2017-11-28 11:34:57 +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 |
|
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 |
|
Mojca Lorber
|
ff998a6c98
|
change text for avatar size on my profile page
|
2017-11-15 14:21:04 +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 |
|
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 |
|
Oleksii Kriuchykhin
|
631b41cdaa
|
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
|
2017-10-19 11:38:23 +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
|
b26b963e54
|
Optimize update canvas SQL and remove module group name [SCI-1642]
|
2017-10-05 16:19:25 +02:00 |
|
Luka Murn
|
beae1b05d8
|
Merge branch 'master' into rails-5.1
Conflicts:
Gemfile
Gemfile.lock
|
2017-09-21 08:27:38 +02:00 |
|
Mojca Lorber
|
a0f7030a70
|
fix bug with tinyMCE text validaton
|
2017-09-07 14:54:12 +02:00 |
|
Luka Murn
|
85634b2fb6
|
Add 'off' before setting export button to 'on'
|
2017-08-07 14:04:39 +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 |
|
Matej Zrimšek
|
d90ca1b934
|
Fixed slow exporting of repositories - JS listeners which triggered function responsible for providing export data was bound more than once. [SCI-1481]
|
2017-08-02 16:49:53 +02:00 |
|
zmagod
|
dfc8ea7fbf
|
don't hide modal [fixes SCI-1487]
|
2017-07-25 14:33:41 +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 |
|
zmagod
|
a2b7bcda4c
|
refactor repositories js files [fixes SCI-1485]
|
2017-07-17 15:05:28 +02:00 |
|
Oleksii Kriuchykhin
|
036ee390ed
|
Fix error messages in repository import and uploading files starting with hyphen[SCI-1484]
|
2017-07-14 16:19:03 +02:00 |
|
Zmago Devetak
|
69919359f1
|
Merge pull request #738 from ZmagoD/zd_SCI_1452
fixes issue with smart annotations in repositories [fixes SCI-1452]
|
2017-07-12 14:50:29 +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 |
|
zmagod
|
baaec67399
|
fixes issue with smart annotations in repositories [fixes SCI-1452]
|
2017-07-10 16:22:32 +02:00 |
|