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

2495 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Luka Murn 6d76029a57 Merge pull request #840 from biosistemika/release-1.12.5 
Merge release-1.12.5 into master
 2017-10-20 14:57:47 +02:00
Luka Murn fa4c787c6b Bump version to 1.12.5 2017-10-20 14:13:58 +02:00
okriuchykhin 44733fefda Merge pull request #839 from okriuchykhin/ok_SCI_1609 
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
 2017-10-19 16:26:36 +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
Zmago Devetak fd755eedf0 Merge pull request #832 from ZmagoD/zd_SCI_1560 
adds label under protocols keywords input [fixes SCI-1560]
 2017-10-18 14:06:13 +02:00
okriuchykhin 8e90e041b9 Merge pull request #825 from okriuchykhin/ok_SCI_1665 
Optimize memory usage in samples/repositories import [SCI-1665]
 2017-10-17 17:26:00 +02:00
Oleksii Kriuchykhin cd0aba1896 Change any? to empty? [SCI-1665] 2017-10-17 15:23:54 +02:00
Oleksii Kriuchykhin c8d2ae70fa Move duplicated code to service [SCI-1665] 2017-10-17 14:46:16 +02:00
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 56f52ebfa7 Optimize memory usage in samples/repositories import [SCI-1665] 2017-10-12 14:43:25 +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
Luka Murn beae1b05d8 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
 2017-09-21 08:27:38 +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
Zmago Devetak 994b08fcfc Merge pull request #752 from ZmagoD/testin-rails-5-addons 
fix background worker bug
 2017-08-25 08:05:21 +02:00
zmagod afa05c8c14 fixed background worker in dev env 2017-08-23 17:10:45 +02:00
Luka Murn 647c879c76 Merge pull request #769 from Ducz0r/lm-sci-1475 
Refactor user settings into a jsonb field [SCI-1475]
 2017-08-23 08:43:23 +02:00
Luka Murn 8e999e673a Remove scinote-web.tgz from index 2017-08-23 08:40:47 +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 ec7b7ffe08 You are my sunshine, my only sunshine, 
You make me happy when skies are grey
You never know, Hound, how much I love you
Please don't take my Hound away
 2017-08-10 14:42:58 +02:00
Luka Murn 9227ea5854 Finish the user settings jsonb, also fix references throughout app 
Closes SCI-1475.
 2017-08-10 14:29:01 +02:00
Luka Murn c62002381b Add default settings migration and concern 2017-08-10 11:30:57 +02:00
Zmago Devetak efd105c499 Merge pull request #759 from ZmagoD/zd_SCI_1471 
fixes signup spec [fixes SCI-1471]
 2017-08-09 16:16:50 +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