scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 07:01:58 +08:00
Code Issues Projects Releases Packages Wiki Activity
4909 commits 31 branches 181 tags 166 MiB
Commit graph

4909 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Kriuchykhin
52dec610b1
Merge pull request #1466 from biosistemika/release_1_15_3 
Add libssl-1.0 to docker images [SCI-2970]
 2019-01-25 17:00:03 +01:00
Alex Kriuchykhin
bbfae1dfac
Merge pull request #1465 from okriuchykhin/ok_SCI_2970 
Add libssl-1.0 to docker images [SCI-2970]
 2019-01-25 16:19:49 +01:00
Oleksii Kriuchykhin
c521e537c3 Add comments to docker files [SCI-2970] 2019-01-25 14:31:32 +01:00
Miha Mencin
344cb55a68
Merge pull request #1455 from biosistemika/SCI-2936-change-indexes-to-bigint 
SCI-2936 Write a DB migration to convert index columns to bigint
 2019-01-25 14:28:24 +01:00
Miha Mencin
713ece6ba6 Merge branch 'master' of github.com:biosistemika/scinote-web into SCI-2936-change-indexes-to-bigint 2019-01-25 14:08:01 +01:00
Miha Mencin
b67cee2e65
Merge pull request #1462 from biosistemika/SCI-2928-turbolinks-bug 
SCI-2928 moving team modal js file to application.js.erb in order to …
 2019-01-25 11:54:14 +01:00
Urban Rotnik
b85386802c Merge branch 'ur-SCI-2935-add-recaptcha-to-invite-users-modal' 2019-01-25 11:30:50 +01:00
Urban Rotnik
16e9a56874 Add recaptcha to invitation modal 
SCI-2935
 2019-01-25 11:27:01 +01:00
Urban Rotnik
99568612b1 Merge branch 'ur-SCI-2968-refactor-export-all-counter-reset-logic' 
SCI-2968
 2019-01-25 11:24:51 +01:00
Urban Rotnik
247bae8a9f Refactor export_all_counter increasing/reseting logic 
- Remove daily task
- Add method to user Model
 2019-01-25 11:16:31 +01:00
Oleksii Kriuchykhin
173c4fc701 Add libssl-1.0 to docker images [SCI-2970] 2019-01-25 11:05:01 +01:00
mlorb
a297ef2094
Merge pull request #1443 from mlorb/ml-sci-2914 
Allow org. administrators to invite them onto all projects [SCI-2914]
 2019-01-24 16:24:57 +01:00
mz3944
79d35de794
Merge pull request #1435 from mz3944/mz-SCI-2912 
An error at archiving experiment with locked task [SCI-2912]
 2019-01-24 05:27:58 +01:00
Miha Mencin
126a031498 SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded 2019-01-23 15:30:23 +01:00
Miha Mencin
58f06ac570
Merge pull request #1459 from Ducz0r/lm-fix-cucumber-tests 
Fix the Cucumber tests so they pass
 2019-01-21 17:20:42 +01:00
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
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
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
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
Oleksii Kriuchykhin
1d4fc7172d Update Ruby to 2.4.5 and add jemalloc package 2019-01-15 17:10:10 +01:00
Oleksii Kriuchykhin
3a4b992f4e Code style fixies []SCI-2875] 2019-01-14 16:31:23 +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