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

8048 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mlorb 28f669393a
Merge pull request #2667 from mlorb/ml-sci-4705 
Implement archiving and restoring of whole inventories [SCI-4705]
 2020-06-19 09:32:54 +02:00
Mojca Lorber 8d43603789 Fix acivities and error handeling 2020-06-19 09:04:42 +02:00
Mojca Lorber 3d59bbd50e Fix default scope bugs 2020-06-18 18:08:53 +02:00
Mojca Lorber 6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
aignatov-bio 101f225d73
Merge pull request #2665 from aignatov-bio/ai-sci-4690-archiving-inventories-items-switching-between-view 
Switching between the active and archived view in inventory [SCI-4690]
 2020-06-18 14:20:12 +02:00
aignatov-bio e7659da0e7 Fix tests 2020-06-18 14:09:29 +02:00
aignatov-bio 323929b270 Add restore/delete buttons 2020-06-18 14:09:29 +02:00
aignatov-bio e9830ebfee Add view switcher 2020-06-18 14:08:24 +02:00
aignatov-bio 8b10d49118 Clean up CSS 2020-06-18 14:08:24 +02:00
Urban Rotnik b498aa54d3
Merge pull request #2661 from urbanrotnik/ur-sci-4740-default-scope 
Update default scope [SCI-4740] [SCI-4687][SCI-4746]
 2020-06-18 14:07:10 +02:00
Urban Rotnik a05be67d3a
Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag 
Add archived tags to assigned repository rows [SCI-4703]
 2020-06-18 13:47:57 +02:00
Urban Rotnik 06fab7d01c Update smart anotation preview for archived items 2020-06-18 13:45:08 +02:00
aignatov-bio 7f9af06f78 Fix dropdown position for full screen modals 2020-06-18 13:29:28 +02:00
Miha Mencin a437e09085
Merge pull request #2669 from biosistemika/release/1.19.3-hotfix 
Release/1.19.3 hotfix
 2020-06-18 12:51:19 +02:00
Miha Mencin e87ef08983
Bump version to 1.9.3 2020-06-18 12:46:52 +02:00
Urban Rotnik 123375f494 Update scopes in reports 2020-06-18 09:33:12 +02:00
Urban Rotnik d5b82f857e Add tag for DOCX 2020-06-18 08:52:59 +02:00
Oleksii Kriuchykhin 86b2eea383 Add repository snapshots to export all [SCI-4738] 2020-06-17 23:21:56 +02:00
aignatov-bio e8ea8b5b3f Fix long inventory name issue on task page 2020-06-17 15:08:07 +02:00
aignatov-bio d0f0baf6b2
Merge pull request #2664 from urbanrotnik/ur-sci-4762-v2 
Canvas fix [SCI-4762] -v2
 2020-06-17 13:01:40 +02:00
Urban Rotnik 41c1230db1 Remove position check from contorller 2020-06-17 11:55:43 +02:00
Alex Kriuchykhin f8a48946c6
Merge pull request #2663 from biosistemika/dependabot/bundler/sanitize-5.2.1 
Bump sanitize from 5.1.0 to 5.2.1
 2020-06-17 10:56:22 +02:00
dependabot[bot] b3912d5c69
Bump sanitize from 5.1.0 to 5.2.1 
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.1.0 to 5.2.1.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v5.1.0...v5.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-16 22:11:34 +00:00
Oleksii Kriuchykhin 8280d2a41e Allow HTML in inline editor, needed for handling smart annotations [SCI-4707] 2020-06-16 13:55:27 +02:00
Urban Rotnik c0a2d4709c
Merge pull request #2662 from urbanrotnik/ai-sci-4770 
Fix MarvinJS modal header [SCI-4770] - HotFix
 2020-06-16 11:44:04 +02:00
aignatov-bio 95ae8215a7 Fix MarvinJS modal header 2020-06-16 10:28:43 +02:00
Urban Rotnik 83bd8c3ad4 Add default scope for non archived repositories 2020-06-16 09:18:22 +02:00
Oleksii Kriuchykhin 0641ad094f Improve user input filtering on user settings page and for task tags [SCI-4707] 2020-06-15 15:41:06 +02:00
aignatov-bio a6ff5b1ed8
Merge pull request #2653 from aignatov-bio/ai-sci-4692-add-archiving-columns-to-datable-helper 
Add archiving column to datatable helper [SCI-4692]
 2020-06-15 15:35:19 +02:00
Urban Rotnik 868c1c1fa0 Improve row state passing 2020-06-15 13:42:16 +02:00
Urban Rotnik 481516260f
Merge pull request #2658 from urbanrotnik/ur-sci-4762-canvas-errors 
Fix update_canvas [SCI-4762]
 2020-06-15 11:59:26 +02:00
Urban Rotnik 15342cd8f2 Fix update_canvas 2020-06-15 10:52:35 +02:00
aignatov-bio fe37afcc41 Update tests 2020-06-15 09:54:01 +02:00
Urban Rotnik ec14cf9fef
Merge pull request #2657 from urbanrotnik/ai-sci-4765-v2 
Fix smart annotation in inventory on edit [SCI-4765] (HotFix branch)
 2020-06-12 11:41:02 +02:00
Urban Rotnik 800465f9a9
Merge pull request #2648 from aignatov-bio/ai-sci-4733-disable-marvinjs-if-not-using 
Not include marvinJS library, if marvinJS disabled [SCI-4733]
 2020-06-12 11:40:41 +02:00
aignatov-bio 97f5a7e9fc Fix smart annotation in inventory on edit 2020-06-12 11:17:50 +02:00
mlorb 0a7c9aeb1a
Merge pull request #2651 from urbanrotnik/ur-sci-4706-archiving-restoring-rows 
Archiving & restoring rows [SCI-4706]
 2020-06-11 16:41:53 +02:00
Urban Rotnik 39eb8145c2 Rename params method 2020-06-11 16:11:23 +02:00
Urban Rotnik 727703a049
Merge pull request #2655 from biosistemika/master 
Version update
 2020-06-11 15:51:55 +02:00
Urban Rotnik 84aacecb81
Bump version to 1.19.2 2020-06-11 15:34:10 +02:00
Urban Rotnik 8928d5ef4e
Merge pull request #2654 from urbanrotnik/ur-ml-sci-4737-cp 
Fix protocol duplication at saving protocol from task to repository [SCI-4737]
 2020-06-11 15:33:16 +02:00