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

8139 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
aignatov-bio 5fc3146174 Update my module repositories dropdown list 2020-06-24 11:23:17 +02:00
aignatov-bio 9694d4016f
Merge pull request #2677 from aignatov-bio/ai-sci-4783-add-migration-for-repository-state 
Add migration for repository states [SCI-4783]
 2020-06-24 11:08:52 +02:00
Urban Rotnik 8dc48e9f95 Remove archiving rows from RepositoryArchiveService 2020-06-24 10:35:24 +02:00
aignatov-bio d940d1e43d Add new line 2020-06-24 10:00:34 +02:00
aignatov-bio 0dff84cae0 Update migration 2020-06-24 09:51:24 +02:00
miha 41bb825f33 SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller 2020-06-23 22:59:21 +02:00
Urban Rotnik 91af7135c1 Update scopes for repository items 2020-06-23 18:24:46 +02:00
Urban Rotnik 6de322498b Delegate archived methods to parent repository 2020-06-23 17:16:02 +02:00
Urban Rotnik efbc05e00e
Merge pull request #2675 from urbanrotnik/ur-sci-4782 
Include archived columns to inventories export [SCI-4782]
 2020-06-23 16:51:50 +02:00
Urban Rotnik c565cbe579 Filter out non active repositories and rows 2020-06-23 10:23:22 +02:00
aignatov-bio 414429afcd
Merge pull request #2674 from aignatov-bio/ai-sci-4784-update-manage-columns-for-archived-repository 
Add archived_by and archived_on column to columns manage modal [SCI-4784]
 2020-06-23 09:10:28 +02:00
Urban Rotnik e89bf58e1c Refactory restore inventory service 2020-06-23 08:24:52 +02:00
Urban Rotnik d874b6f732 Refactory archive inventory service 2020-06-22 22:45:34 +02:00
aignatov-bio 0fe4ee0eae Add migration for repository states 2020-06-22 16:47:42 +02:00
Urban Rotnik 30de400cf9
Merge pull request #2676 from mlorb/ml-sci-4786 
Revert default_scope for active repositories [SCI-4786]
 2020-06-22 16:17:39 +02:00
aignatov-bio 220538d0e2
Merge pull request #2672 from aignatov-bio/ai-sci-4778-add-acions-to-buttons-on-inventory-page 
Add action buttons to repository index [SCI-4778]
 2020-06-22 16:16:54 +02:00
Mojca Lorber 22a45237be Remove doubled code 2020-06-22 15:41:24 +02:00
Mojca Lorber be19190ff1 Revert default_scope for active repositories 2020-06-22 14:57:35 +02:00
Urban Rotnik d1b1b5f268 Include archived columns to inventories export 2020-06-22 14:28:49 +02:00
aignatov-bio dc50e7f1fd Add archived_by and archived_on column to columns manage modal 2020-06-22 14:00:44 +02:00
aignatov-bio b64b6ed326 Remove hack for activities 2020-06-22 10:24:58 +02:00
aignatov-bio 593455537d Fix tests 2020-06-22 09:48:37 +02:00
Urban Rotnik 07ca1de737 Fix valdiation for snapshot selection 2020-06-22 07:30:49 +02:00
aignatov-bio 6f2d5b359e Add action buttons to repository index 2020-06-19 15:54:45 +02:00
mlorb 47aac74719
Merge pull request #2671 from mlorb/ml-fix-activities-filters 
Fix activities filters
 2020-06-19 11:42:24 +02:00
Mojca Lorber 8d9d3778e1 Fix activities filters 2020-06-19 10:46:58 +02:00