scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-27 02:16:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
5204 commits 69 branches 179 tags 166 MiB
Commit graph

5204 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luka Murn 208ef0bfe1 Fix the Cucumber tests so they pass 
With the change of factories, single Cucumber test stopped
working due to text in the test being dependant on a now randomly
(Faker) defined value.
 2019-01-21 15:06:39 +01:00
Luka Murn 38d303b658
Merge pull request #1446 from Ducz0r/lm-remove-test-folder 
Remove test folder
 2019-01-21 14:07:22 +01:00
Miha Mencin 6e16a63dcd implementing suggestion from alex, now table and indices names are hardoced 2019-01-21 11:02:33 +00:00
mz3944 f6c8af105d
Merge pull request #1434 from mz3944/mz-SCI-2903 
Fix (unite) Date and Time display formats [SCI-2903]
 2019-01-21 09:50:34 +01:00
Luka Murn f9f907015d Remove test_helper.rb from addon generator 2019-01-18 17:54:27 +01:00
Urban Rotnik 30d0fcdf00 Merge branch 'ur-SCI-2924' (Refactor generate_workflow_image into service) 2019-01-18 17:01:23 +01:00
Urban Rotnik f1d59e65f3 Add module and rename service object 2019-01-18 16:56:33 +01:00
Urban Rotnik b41dc0a4d5 Specs for workflow_image_fenerator 
fix SCI-2924
 2019-01-18 16:56:33 +01:00
Urban Rotnik d738169120 Refactor FactoryBot factories 2019-01-18 16:56:33 +01:00
Urban Rotnik 47cc6a9d10 Refactor workflow_image_generation and move to service class 2019-01-18 16:56:33 +01:00
Urban Rotnik 686f10cbd0 Refactor instance method 'ordered_modules' to scope 2019-01-18 16:56:33 +01:00
Urban Rotnik 457e9990c5 Add overcommit gem for git hooks (rubocop) 2019-01-18 16:56:28 +01:00
Urban Rotnik 1b70f42817 Refactor 'Experiment.modules_without_group' to Module's scope 2019-01-18 16:54:00 +01:00
Urban Rotnik 1706c14b97 Merge branch 'ur-SCI-prepare-osx-local-env' 2019-01-18 16:44:37 +01:00
mlorb d2108ac3ea fix hound 2019-01-18 16:16:00 +01:00
Urban Rotnik 6cf4717ab3 Add envirnoments to run app without docker, reorder Gemfile 
- Reorder Gemfile into alphabet order (rule by Rubocop)
- Add extra ENV variable for custom DB settings locally
- Add extra ENV for disable spoof check on Paperclip
 2019-01-18 16:01:09 +01:00
mlorb 7fdef4d3ec Change experiment cards look and feel 2019-01-18 15:57:44 +01:00
Oleksii Kriuchykhin fdf7db425b Merge branch 'master' into features/templates 2019-01-18 14:41:21 +01:00
Alex Kriuchykhin 849d5c7509
Merge pull request #1451 from jbargu/jg_sci_2937_team_export 
Extract the experiments export & import code from team_exporter/team_importer
 2019-01-18 14:40:44 +01:00
Alex Kriuchykhin 30155a2010
Merge pull request #1456 from okriuchykhin/release-1.15.3 
Update VERSION to 1.15.3
 2019-01-18 10:56:40 +01:00
Oleksii Kriuchykhin b6d291d658 Update VERSION to 1.15.3 2019-01-18 10:53:57 +01:00
Miha Mencin 7ade88cf92 SCI-2936 code style final 2019-01-18 09:38:04 +01:00
Miha Mencin 70b1852d64 SCI-2936 code style 2019-01-18 09:33:45 +01:00
Miha Mencin 2271e453df SCI-2936 minor refactor and code styling 2019-01-18 09:25:32 +01:00
Miha Mencin f6230b2c9a SCI-2936 added down method, make code more readable 2019-01-17 18:10:45 +01:00
Miha Mencin 4a6459000f SCI-2936 added migration 2019-01-17 17:54:15 +01:00
Alex Kriuchykhin f765bd5d91
Merge pull request #1454 from okriuchykhin/ok_SCI_2965 
Improve export all modal messages in case of unlimited exports [SCI-2965]
 2019-01-17 17:29:37 +01:00
Oleksii Kriuchykhin 1861f86b2c Improve export all modal messages in case of unlimited exports [SCI-2965] 2019-01-17 17:27:32 +01:00
Alex Kriuchykhin 966c729a9c
Merge pull request #1453 from okriuchykhin/ok_SCI_2776_v2 
Fix issue with caching in inventories dropdown [SCI-2776]
 2019-01-17 15:14:28 +01:00
Oleksii Kriuchykhin e62e1873b0 Fix issue with caching in inventories dropdown [SCI-2776] 2019-01-17 15:04:20 +01:00
Alex Kriuchykhin 88cea198f0
Merge pull request #1452 from okriuchykhin/ok_SCI_2950 
Fix binary files in Export All archive [SCI-2950]
 2019-01-16 17:29:48 +01:00
Oleksii Kriuchykhin 4f9eb7e165 Fix binary files in Export All archive [SCI2950] 2019-01-16 17:07:05 +01:00
Jure Grabnar 761932282b Fix Hound formatting 
Closes SCI-2937
 2019-01-16 16:11:38 +01:00
Jure Grabnar d1f966ee05 Add importing of the experiment templates 2019-01-16 15:54:03 +01:00
Miha Mencin 0766ee96a7
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2 
Fix task tags update on canvas cards [SCI-2875]
 2019-01-16 12:44:50 +01:00
Alex Kriuchykhin c771db246b
Merge pull request #1449 from okriuchykhin/ruby_245_update 
Update Ruby to 2.4.5 and add jemalloc package
 2019-01-16 10:32:37 +01:00
Jure Grabnar 5b496a85d3 Experiment exporting works 2019-01-16 08:37:05 +01:00
Jure Grabnar 0184c97c61 Refactor TeamExporter into ModelExporter 2019-01-16 08:00:01 +01:00
Oleksii Kriuchykhin 1d4fc7172d Update Ruby to 2.4.5 and add jemalloc package 2019-01-15 17:10:10 +01:00
Jure Grabnar ff17a7e367 Fix S3_BUCKET not being defined 2019-01-14 16:49:08 +01:00
Oleksii Kriuchykhin 3a4b992f4e Code style fixies []SCI-2875] 2019-01-14 16:31:23 +01:00
Matej Zrimšek a5c1cf4450 Switch user's team if he's no longer a member of the currently selected one 2019-01-12 23:39:31 +01:00
Matej Zrimšek 838455af0d Fix protocols.io Date handling at import 2019-01-12 19:28:45 +01:00
Oleksii Kriuchykhin 89240659a7 Fix task tags update on canvas cards [SCI-2875] 2019-01-11 17:20:39 +01:00
Alex Kriuchykhin b530cea771
Merge pull request #1438 from okriuchykhin/ok_SCI_2776 
Add counters to task inventories dropdown [SCI-2776]
 2019-01-11 16:27:22 +01:00
Alex Kriuchykhin be514fd62d
Merge pull request #1445 from okriuchykhin/ok_SCI_2931 
Fix image URLs in export all document [SCI-2931]
 2019-01-11 12:03:06 +01:00
Luka Murn a096175d0c Remove test folder (apart from mailer) & update addon generator 2019-01-11 11:27:31 +01:00
Oleksii Kriuchykhin 132f46b136 Improve error handling in task inventories dropdown [SCI-2776] 2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin ec28db6f4f Fix image URLs in export all document [SCI-2931] 2019-01-10 14:19:40 +01:00
Alex Kriuchykhin c2b38af91e
Merge pull request #1439 from okriuchykhin/ok_SCI_2888 
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
 2019-01-10 11:05:07 +01:00