Commit graph

2382 commits

Author SHA1 Message Date
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
mlorb
91e2a6bab2 Merge pull request #787 from mlorb/ml-sci-1561
Fix bug with tinyMCE text validaton [SCI-1561]
2017-10-05 08:39:22 +02:00
okriuchykhin
2c5d913048 Merge pull request #804 from okriuchykhin/ok_SCI_1482
Improve memory utilization in PDF report generator [SCI-1482]
2017-10-04 17:51:28 +02:00
Oleksii Kriuchykhin
6824f9a8bc Improve memory utulization in PDF report generator [SCI-1482] 2017-10-02 11:29:22 +02:00
Luka Murn
7cc2136c74 Bump VERSION to 1.12.4 2017-09-29 13:32:31 +02:00
okriuchykhin
34d1735cf5 Merge pull request #800 from okriuchykhin/ok_SCI_1623_v2
Update AWS SDK v2 [SCI-1623]
2017-09-26 14:46:02 +02:00
Oleksii Kriuchykhin
faaa016267 Update AWS SDK v2 [SCI-1623] 2017-09-26 13:41:53 +02:00
Luka Murn
4f8f248cd2 Merge pull request #798 from Ducz0r/lm-opensci-26-fix
Fix missing value in delayed_uploader_tutorial
2017-09-22 17:12:21 +02:00
Luka Murn
05e627e976 Fix missing value in delayed_uploader_tutorial
Closes OPENSCI-26.
2017-09-22 17:10:53 +02:00
mlorb
03743a21f6 Merge pull request #786 from mlorb/ml-sci-1587
Fix bugs with importing samples [SCI-1587]
2017-09-08 09:19:35 +02:00
Mojca Lorber
a0f7030a70 fix bug with tinyMCE text validaton 2017-09-07 14:54:12 +02:00
Mojca Lorber
0e14420193 fix bugs with importing samples 2017-09-06 14:41:14 +02:00
Luka Murn
67017d383c Merge pull request #761 from Ducz0r/lm-add-versions-rake-file
Add versions Rake
2017-08-23 08:36:45 +02:00
Luka Murn
5ee7fd895c Moved the arrays into json 2017-08-23 08:35:48 +02:00
Luka Murn
b6eb46471a Merge pull request #753 from Ducz0r/lm-remove-some-code
Remove some code we're no longer maintaining
2017-08-22 14:04:04 +02:00
Luka Murn
1cabe84910 Merge pull request #774 from Ducz0r/lm-sci-1376
Update delayed_paperclip library [SCI-1376]
2017-08-22 09:23:30 +02:00
Luka Murn
90188c89c9 Update delayed_paperclip library
Closes SCI-1376.
2017-08-22 08:34:58 +02:00
Luka Murn
cf2b06d82f Merge pull request #760 from mz3944/mz-SCI-1481
Fixed slow exporting of repositories - JS listeners which triggered f… [SCI-1481]
2017-08-07 14:11:50 +02:00
Luka Murn
85634b2fb6 Add 'off' before setting export button to 'on' 2017-08-07 14:04:39 +02:00
Luka Murn
a9b74e3b95 Merge branch 'mz-SCI-1481' of https://github.com/mz3944/scinote-web into mz3944-mz-SCI-1481 2017-08-07 14:00:23 +02:00
Luka Murn
6239e01536 Bump version to 1.12.3 2017-08-03 13:35:41 +02:00
Luka Murn
77fdaaeb2e Add versions Rake file 2017-08-03 11:28:33 +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
mz3944
25f4095446 Merge pull request #756 from mz3944/mz_SCI_1524
Fix permissions for editing and deleting custom repository custom columns. [SCI-1524]
2017-07-28 15:58:33 +02:00
Matej Zrimšek
07fea16d26 Fix permissions for editing and deleting custom repository custom columns. [SCI-1524] 2017-07-28 12:01:11 +02:00
Luka Murn
03a7440136 Remove SkyLight stuff (we're not using it any more) 2017-07-27 14:26:44 +02:00
Luka Murn
fbdf96f04b Remove 3rd party licenses file & fake data generator 2017-07-27 14:12:28 +02:00
Luka Murn
61e4072c62 Bump version to 1.12.2 2017-07-26 13:39:21 +02:00
okriuchykhin
af4b310754 Add ordering for column mappings in repositories 2017-07-26 13:35:54 +02:00
okriuchykhin
1f7528d4a4 Merge pull request #751 from okriuchykhin/ok_SCI_1519
Fix adding and editing repository items [SCI-1519]
2017-07-26 11:25:43 +02:00
Oleksii Kriuchykhin
6a43483a2f Fix adding and editing repository items [SCI-1519] 2017-07-26 11:22:26 +02:00
okriuchykhin
38f254ae9b Merge pull request #749 from ZmagoD/zd_SCI_1487
don't hide modal [fixes SCI-1487]
2017-07-25 14:35:10 +02:00
zmagod
dfc8ea7fbf don't hide modal [fixes SCI-1487] 2017-07-25 14:33:41 +02:00
okriuchykhin
532153b9cb Merge pull request #747 from okriuchykhin/ok_SCI_101
Improve samples import speed [SCI-101]
2017-07-25 14:10:45 +02:00
Oleksii Kriuchykhin
efd03db6db Further samples import improvement [SCI-101] 2017-07-25 10:56:07 +02:00
mz3944
895eb22702 Merge pull request #748 from mz3944/mz-SCI-1516
Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516]
2017-07-25 10:49:33 +02:00
Matej Zrimšek
ad0dce921b Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516] 2017-07-24 18:12:41 +02:00
Oleksii Kriuchykhin
67b0c78593 Improve samples import speed [SCI-101] 2017-07-24 17:33:13 +02:00
okriuchykhin
a49c35df9f Merge pull request #746 from okriuchykhin/ok_SCI_1487
Improve import of repository records plus tsv file import fixes [SCI-1487]
2017-07-21 11:01:31 +02:00
Oleksii Kriuchykhin
6d56e6b72e Remove redundant self [SCI-1487] 2017-07-20 11:51:42 +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
okriuchykhin
c504382f68 Merge pull request #744 from okriuchykhin/ok_SCI_1484
Fix error messages in repository import and uploading files starting with hyphen [SCI-1484]
2017-07-18 15:19: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
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
77893e6bcb Merge pull request #743 from ZmagoD/zd_SCI_1483
fixes sorting of assigned column [fixes SCI-1483]
2017-07-14 12:01:42 +02:00
mlorb
a73e0b0a80 Merge pull request #742 from mlorb/ml-sci-1479
Remove redundant rollback call [SCI-1479]
2017-07-14 12:00:12 +02:00
zmagod
506e47a595 fixes sorting of assigned column [fixes SCI-1483] 2017-07-14 09:45:36 +02:00