scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
2397 commits 70 branches 179 tags 165 MiB
Commit graph

2397 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zmagod 30d091dc65 adds label under protocols keywords input [fixes SCI-1560] 2017-10-17 14:10:56 +02:00
Luka Murn 533f371984 Merge pull request #830 from biosistemika/revert-820-lm-sci-1675 
Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"
 2017-10-17 13:13:20 +02:00
Luka Murn 4d8f2665d3 Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]" 2017-10-17 13:10:02 +02:00
okriuchykhin 66e9e60c9d Merge pull request #826 from okriuchykhin/ok_SCI_1689 
Use case insensitive sample types and groups in import [SCI-1689]
 2017-10-16 13:32:04 +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
Oleksii Kriuchykhin d266034406 Use case insensitive sample types and groups in import [SCI-1689] 2017-10-13 17:15:51 +02:00
Luka Murn 38bce08b5a Minor wording change. 2017-10-13 09:27:18 +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
gazvoda 88f03a0706 Merge pull request #735 from gazvoda/lg-SCI-1249-v2 
Truncate checklist items in activity modal [fixes SCI-1249]
 2017-10-12 15:58:05 +02:00
Oleksii Kriuchykhin 9a8e33c6d7 Small fixes [SCI-1642] 2017-10-11 17:24:31 +02:00
Luka Murn fe89b942e7 Add Add-ons page to User -> Settings -> Account 
Closes SCI-1675.
 2017-10-11 14:15:37 +02:00
lenart de3c18509f Variable name changes, added comments to code [fixes SCI-1249] 2017-10-06 17:12:15 +02:00
Oleksii Kriuchykhin 6820511ea0 Further canvas optimizations [SCI-1642] 2017-10-06 12:43:27 +02:00
Oleksii Kriuchykhin b26b963e54 Optimize update canvas SQL and remove module group name [SCI-1642] 2017-10-05 16:19:25 +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
lenart 6c5bc32f24 Revert incorrect changes from previous commit [SCI-1249] 2017-08-02 16:00:23 +02:00
lenart e781dfc6a6 Truncate activity taking smart annotations into account fixes [SCI-1249] 2017-08-02 15:51:32 +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