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
8165 commits 70 branches 179 tags 165 MiB
Commit graph

8165 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio 742fb0d27b Small 2fa improvments 2020-07-01 14:41:55 +02:00
aignatov-bio 4b9881e31e Add 2fa to user settings page 2020-07-01 13:25:06 +02:00
Urban Rotnik d88f789e44
Merge pull request #2696 from urbanrotnik/ur-sci-4753 
Add 2FA to login flow [SCI-4753]
 2020-07-01 13:19:40 +02:00
aignatov-bio c479c6100c Clear table state on error 2020-07-01 12:49:24 +02:00
Urban Rotnik 62a4a5f203 Add 2fa login 2020-07-01 12:46:26 +02:00
aignatov-bio 876cfada9a
Merge pull request #2693 from aignatov-bio/ai-sci-4539-add-special-characters-to-smart-annotation 
Add special characters to smart annotation [SCI-4539]
 2020-07-01 09:03:30 +02:00
Mojca Lorber 22b71bc9cb Merge branch 'develop' into ml-sci-4261 2020-06-30 13:47:32 +02:00
Mojca Lorber cf9c3be4cf Move before actions in RepositoryColumnsController 2020-06-30 13:44:49 +02:00
aignatov-bio 1a5f32bd94
Merge pull request #2692 from aignatov-bio/ai-sci-4754-enable-2fa-button-in-settings 
Add enable 2fa button to user settings [SCI-4754]
 2020-06-29 15:11:45 +02:00
aignatov-bio 630bef1adf Add special characters to smart annotation 2020-06-29 14:47:35 +02:00
Oleksii Kriuchykhin 166a0ddd34 Improve code styling [SCI-4738] 2020-06-29 11:43:23 +02:00
Urban Rotnik 63365d2026
Merge pull request #2688 from urbanrotnik/ur-sci-4752 
Add 2fa fields to user [SCI-4752]
 2020-06-29 11:41:01 +02:00
Alex Kriuchykhin 8236598587
Merge pull request #2644 from okriuchykhin/ok_SCI_4665 
Remove spinner in repository table after error caused by provisioning snapshot [SCI-4665]
 2020-06-29 11:02:49 +02:00
aignatov-bio fe79fa4788 Fix markup 2020-06-29 10:57:41 +02:00
aignatov-bio 6fa97d3639 Add enable 2fa button to user settings 2020-06-29 10:56:06 +02:00
Urban Rotnik de8aca9dbd Rename column 2020-06-29 10:42:19 +02:00
Miha Mencin e8d3b72408
Merge pull request #2689 from biosistemika/dependabot/bundler/rack-2.2.3 
Bump rack from 2.2.2 to 2.2.3
 2020-06-29 10:19:26 +02:00
Oleksii Kriuchykhin 405d5b31bb Remove spinner in repository table after error caused by provisioning snapshot [SCI-4665] 2020-06-29 10:04:31 +02:00
aignatov-bio bde548227b
Merge pull request #2687 from aignatov-bio/ai-sci-4775-small-improvments-for-tinymce-tables 
Add tables to TinyMce and small table improvements [SCI-4775]
 2020-06-29 09:52:03 +02:00
aignatov-bio 1c34762af3
Merge pull request #2690 from aignatov-bio/ai-sci-4791-fix-shared-inventories-in-task-repositories-dropdown 
Fix repositories dropdown on task page [SCI-4791]
 2020-06-29 09:51:51 +02:00
Miha Mencin 76c2e032dc
Merge pull request #2666 from aignatov-bio/ai-sci-4747-fix-long-inventory-name 
Fix long inventory name issue on task page  [SCI-4747]
 2020-06-29 09:44:21 +02:00
Miha Mencin 6db1401759
Merge pull request #2670 from aignatov-bio/ai-sci-4745-fix-manage-column-dropdown-position 
Fix dropdown position for full-screen modals [SCI-4745]
 2020-06-29 09:43:13 +02:00
Miha Mencin bfdf53c514
Merge pull request #2673 from urbanrotnik/ur-sci-4749 
Fix valdiation for snapshot selection [SCI-4749]
 2020-06-29 09:42:37 +02:00
Alex Kriuchykhin faa76a6442
Merge pull request #2660 from okriuchykhin/ok_SCI_4707_v2 
Improve user input filtering on user settings page and for task tags [SCI-4707]
 2020-06-29 09:30:45 +02:00
aignatov-bio 6c7edbb9be Fix markup 2020-06-26 14:32:55 +02:00
aignatov-bio 2da0a6c6bf Improve repository state migration 2020-06-26 14:31:10 +02:00
aignatov-bio 968963c24b Fix repositories dropdown on task page 2020-06-26 11:19:40 +02:00
dependabot[bot] 8e07148c49
Bump rack from 2.2.2 to 2.2.3 
Bumps [rack](https://github.com/rack/rack) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.2...2.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-24 17:53:32 +00:00
Urban Rotnik 88f54b16d7 Add 2fa fields to user 2020-06-24 17:58:58 +02:00
Oleksii Kriuchykhin 64b66f0d73 Remove obsolete attribute in repository_datatable.js after feature branch merge 2020-06-24 16:25:42 +02:00
aignatov-bio 6a41290d9d Add tables to TinyMce and small table improvments 2020-06-24 15:51:59 +02:00
Alex Kriuchykhin 114a3d0946
Merge pull request #2686 from aignatov-bio/ai-sci-revert-helper-js-to-es5 
Revert helper JS to es5
 2020-06-24 15:26:33 +02:00
aignatov-bio 4f8a612106 add new line 2020-06-24 15:25:34 +02:00
Oleksii Kriuchykhin bee4f2d948 Update uglifier to 4.2.0 2020-06-24 15:20:24 +02:00
aignatov-bio a3ea0927c9 Revert helper JS to es5 2020-06-24 15:12:13 +02:00
Alex Kriuchykhin b5b5173a20
Merge pull request #2685 from aignatov-bio/ai-sci-remove-hashes-from-datatable-helper 
Remove hashes from datatable helper
 2020-06-24 14:43:04 +02:00
aignatov-bio 80970b6448 Remove hashes from datatable helper 2020-06-24 14:39:33 +02:00
Oleksii Kriuchykhin 7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Alex Kriuchykhin 4793843977
Merge pull request #2684 from urbanrotnik/ur-sci-4678-disable-checkbox 
Disable checkbox for shared inventories [SCI-4781]
 2020-06-24 13:57:27 +02:00
Alex Kriuchykhin 2125c8bf83
Merge pull request #2683 from mlorb/ml-sci-4742 
Hide archived and not assigned items … [SCI-4742]
 2020-06-24 13:47:22 +02:00
Urban Rotnik 193375818e Disable checkboxes for shared inventories 2020-06-24 13:41:00 +02:00
Mojca Lorber 7e645eade4 Add active scope to repository_rows in assigning servise 2020-06-24 13:22:09 +02:00
Alex Kriuchykhin 2a315ac106
Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button 
SCI-4780 replace delete button with archive button
 2020-06-24 13:16:11 +02:00
Alex Kriuchykhin e1b862a332
Merge pull request #2679 from urbanrotnik/ur-sci-4741-api-endopints-update 
Filter out non active repositories and rows [SCI-4741]
 2020-06-24 12:51:13 +02:00
Mojca Lorber bdf959db1f Hide archived and not assigned items from the assigning screen on the task 2020-06-24 12:06:53 +02:00
Alex Kriuchykhin 8a17b721db
Merge pull request #2678 from urbanrotnik/ur-sci-4878 
Update all rows on repository archive/restore [SCI-4787]
 2020-06-24 12:06:41 +02:00
Oleksii Kriuchykhin 8e0ed286fb Improve repositories loading for archive/restore [SCI-4780] 2020-06-24 12:01:38 +02:00
aignatov-bio 3f309832fc
Merge pull request #2682 from aignatov-bio/ai-sci-4743-update-my-module-repoistories-dropdown-list 
Update my module repositories dropdown list [SCI-4743]
 2020-06-24 11:54:07 +02:00
Urban Rotnik 2f4bf95373 Revert scrope 2020-06-24 11:42:59 +02:00
Oleksii Kriuchykhin 29f62419bd Improve repository archive/restore actions [SCI-4780] 2020-06-24 11:32:20 +02:00