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

7237 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kriuchykhin 3f52d538e9
Merge pull request #2442 from aignatov-bio/ai-sci-fix-invite-user-modal 
Add user check to invite user modal
 2020-03-03 11:29:20 +01:00
aignatov-bio e46e496702 Add user check to invite user modal 2020-03-03 10:30:04 +01:00
Oleksii Kriuchykhin a819e1b8f4 Merge branch 'hotfix/1.17.11' into develop 2020-03-02 11:58:25 +01:00
Oleksii Kriuchykhin 03f08c4c06 Merge branch 'hotfix/1.18.4' into develop 2020-03-02 11:56:45 +01:00
Oleksii Kriuchykhin daaea277f1 Bump version to 1.18.4 2020-03-02 10:20:45 +01:00
Alex Kriuchykhin f9ad438fb5
Merge pull request #2431 from okriuchykhin/ok_SCI_4381 
Add invite users to the team permission check [SCI-4381]
 2020-02-28 16:40:57 +01:00
Alex Kriuchykhin f6a47eca14
Merge pull request #2423 from okriuchykhin/ok_SCI_4370 
Add variables with TLS CA configuration for mail [SCI-4370]
 2020-02-28 16:40:41 +01:00
Alex Kriuchykhin b83cbf33a7
Merge pull request #2408 from aignatov-bio/ai-sci-4345-file-results-bug 
Fix files handling in results [SCI-4345]
 2020-02-28 16:40:05 +01:00
aignatov-bio c4be9bca2f Fix files handling in results 2020-02-28 14:55:13 +01:00
aignatov-bio a0015fe184
Merge pull request #2432 from aignatov-bio/ai-sci-4304-fix-assigned-task-position 
Fix assigned tasks position [SCI-4304]
 2020-02-28 13:54:19 +01:00
aignatov-bio 4aaeb2043f
Merge pull request #2433 from aignatov-bio/ai-sci-4390-change-new-inventory-button-design 
Change button style for new inventory [SCI-4390]
 2020-02-28 13:54:07 +01:00
aignatov-bio 6625ef9eb5
Merge pull request #2435 from aignatov-bio/ai-sci-4385-fix-z-index-for-dropdown 
Fix z-index for dropdown [SCI-4385]
 2020-02-28 13:53:55 +01:00
Alex Kriuchykhin 77f422ceda
Merge pull request #2436 from okriuchykhin/ok_SCI_4404 
Switch to serial multiple file uploads for better compatibility [SCI-4404]
 2020-02-28 11:54:08 +01:00
Oleksii Kriuchykhin b4a8a7ba72 Switch to serial multiple file uploads for better compatibility [SCI-4404] 2020-02-27 16:58:00 +01:00
aignatov-bio ace8613457 Fix z-index for dropdown 2020-02-27 13:16:11 +01:00
aignatov-bio 630412c18a Change button style for new inventory 2020-02-27 12:11:38 +01:00
aignatov-bio d31fc33873 Fic assigned tasks position 2020-02-27 11:47:47 +01:00
Alex Kriuchykhin bf1fac0b10
Merge pull request #2421 from aignatov-bio/ai-sci-4256-transparent-image-for-image-preview 
Add checkboard background for transparent images [SCI-4256]
 2020-02-26 17:46:48 +01:00
Alex Kriuchykhin a41c1c606b
Merge pull request #2419 from aignatov-bio/ai-sci-4328-hide-tooltip-if-object-hide 
Hide tooltip if parent object disabled or hidden [SCI-4328]
 2020-02-26 17:35:34 +01:00
Alex Kriuchykhin 6841cdd6a6
Merge pull request #2415 from aignatov-bio/ai-sci-4365-new-description-to-import-items 
New description to import items modal window [SCI-4365]
 2020-02-26 17:34:57 +01:00
Alex Kriuchykhin 9917a547ce
Merge pull request #2417 from aignatov-bio/ai-sci-4364-add-border-to-add-column-button 
Add border to add column button [SCI-4363]
 2020-02-26 17:33:47 +01:00
Oleksii Kriuchykhin 62c19f7c02 Add invite users to the team permission check [SCI-4381] 2020-02-26 17:25:38 +01:00
Alex Kriuchykhin b4c6be4bf5
Merge pull request #2429 from biosistemika/dependabot/bundler/nokogiri-1.10.8 
Bump nokogiri from 1.10.4 to 1.10.8
 2020-02-25 09:29:54 +01:00
dependabot[bot] cac9580d99
Bump nokogiri from 1.10.4 to 1.10.8 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.4 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.4...v1.10.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-02-25 04:38:49 +00:00
Oleksii Kriuchykhin b6ecaf731d Bump version to 1.17.11 2020-02-24 16:19:58 +01:00
Alex Kriuchykhin 445a207fd4
Merge pull request #2427 from okriuchykhin/ok_SCI_4360 
Fix empty mime type for ActiveStorage local file service [SCI-4360]
 2020-02-24 16:15:11 +01:00
Oleksii Kriuchykhin 0cb9584a2b Fix empty mime type for ActiveStorage local file service [SCI-4360] 2020-02-24 16:04:35 +01:00
Oleksii Kriuchykhin 8c50fe7d4c Add variables with TLS CA configuration for mail [SCI-4370] 2020-02-20 11:10:20 +01:00
Alex Kriuchykhin dbc5bfeb14
Merge pull request #2422 from biosistemika/develop 
Release 1.18.3
 2020-02-19 12:44:44 +01:00
Miha Mencin f2ce01db75
Bump version to 1.18.3 2020-02-19 12:33:53 +01:00
aignatov-bio b87d6a22a7 Add checkboard background for transparent images 2020-02-19 10:48:31 +01:00
Alex Kriuchykhin b99a466b21
Merge pull request #2420 from aignatov-bio/ai-sci-travis-check 
Fix travis
 2020-02-19 10:27:39 +01:00
aignatov-bio e252b1e1de Add default postgres user to dev env 2020-02-19 10:26:37 +01:00
Alex Kriuchykhin d73ea73b04
Merge pull request #2411 from okriuchykhin/ok_SCI_4319_v2 
Fix unfolding of the active element in sidebar [SCI-4319]
 2020-02-19 10:24:13 +01:00
aignatov-bio ae3db4c1fd Remove db logs 2020-02-19 10:23:32 +01:00
aignatov-bio 0d584c29f5 Add default password to DB 2020-02-19 09:54:40 +01:00
aignatov-bio c2050a8500 Check travis 2020-02-18 16:59:52 +01:00
aignatov-bio 47a86f2cf9 Hide tooltip if parent object disabled or hidden 2020-02-18 15:40:05 +01:00
aignatov-bio bbd48c9e08 Add border to add column button 2020-02-18 14:40:16 +01:00
aignatov-bio 5886f2cf90 New description to import items modal window 2020-02-18 12:13:52 +01:00
mlorb 618aa698d5
Merge pull request #2407 from mlorb/ml-sci-4329 
Fix adding too small/big number to input... [SCI-4329]
 2020-02-14 10:40:20 +01:00
mlorb 9f23f11dca
Merge pull request #2410 from mlorb/ml-sci-4309 
Hide pencil for shared inventory [SCI-4309]
 2020-02-13 15:12:17 +01:00
aignatov-bio 87d4c18ff7
Merge pull request #2409 from aignatov-bio/ai-sci-4235-refactor-notifications 
Move notifications to top navbar [SCI-4235]
 2020-02-13 14:32:16 +01:00
Oleksii Kriuchykhin 3959f880eb Fix unfolding of the active element in sidebar [SCI-4319] 2020-02-13 12:16:35 +01:00
aignatov-bio bdf4394d5f Clean notifications partial from layouts 2020-02-13 09:52:45 +01:00
Mojca Lorber 6fbecf3e88 Hide pencil for shared inventory 2020-02-12 20:28:15 +01:00
aignatov-bio 0381fef05b Move notifications to top navbar 2020-02-12 14:58:48 +01:00
aignatov-bio d0fd956600
Merge pull request #2406 from aignatov-bio/ai-sci-4347-error-caused-by-dot-number 
Fix error in number column in repository [SCI-4347]
 2020-02-12 14:16:46 +01:00
aignatov-bio 59f52c6cc5
Merge pull request #2405 from aignatov-bio/ai-sci-4002-remove-shared-inventories-with-view-permissions 
Remove shared inventories with view permission from dropdown list [SCI-4002]
 2020-02-12 14:16:33 +01:00
aignatov-bio ddadc073d4
Merge pull request #2404 from aignatov-bio/ai-sci-4307-add-indetermined-state-for-share-inventory 
Add "indetermined" state for the "select all" checkbox in the Share Inventories [SCI-4307]
 2020-02-12 14:16:19 +01:00