scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-28 03:06:28 +08:00
Code Issues Projects Releases Packages Wiki Activity
13297 commits 39 branches 184 tags 168 MiB
Commit graph

13297 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
aignatov-bio
90f66afddf
Merge pull request #5595 from aignatov-bio/ai-sci-8541-update-buttom-action-toolbar 
Update bottom action toolbar css [SCI-8541]
 2023-06-14 15:13:31 +02:00
Anton
5643ca4387 Update bottom action toolbar css [SCI-8541] 2023-06-14 15:10:17 +02:00
artoscinote
2ceaea77a5
Merge pull request #5591 from G-Chubinidze/gc_SCI_8511 
Settings page - breadcrumbs
 2023-06-14 15:02:41 +02:00
G-Chubinidze
0ad1540a41
Merge branch 'features/ui-revamp' into gc_SCI_8511 2023-06-14 17:02:18 +04:00
ajugo
272de72231
Prevent closing assign modal from inventory for dropdown options [SCI-8640] (#5593) 2023-06-14 14:57:58 +02:00
aignatov-bio
85949b33aa
Merge pull request #5594 from aignatov-bio/ai-sci-8558-add-new-buttons-ui 
Add new button style [SCI-8558]
 2023-06-14 14:55:46 +02:00
Anton
4674f64905 Add new button style [SCI-8558] 2023-06-14 14:54:10 +02:00
ajugo
dea721cdf0
Fix click away table update [SCI-8432] (#5589) 2023-06-14 10:20:40 +02:00
ajugo
1397e88eae
Fix route for repositories export [SCI-8445] (#5590) 2023-06-14 10:20:25 +02:00
Giga Chubinidze
41d42d47bd update addon controller 2023-06-14 05:15:18 +04:00
Giga Chubinidze
88df4b2a11 Settings page - breadcrumbs [SCI-8511] 2023-06-14 05:13:33 +04:00
Soufiane
23e248ca02
Changed wording for activities [SCI-8243] (#5356) 
* Change wording for access activities in projects and protocols [SCI-8243]
* Add project activity for changing all team members role via project option-edit [SCI-8243]
 2023-06-13 16:55:40 +02:00
artoscinote
820bf7808a
Merge pull request #5586 from G-Chubinidze/gc_SCI_8476 
Breadcrumbs on label/protocol template page [SCI-8476]
 2023-06-13 14:49:14 +02:00
Alex Kriuchykhin
976c29c136
Add CSP nonce to JQuery bundle inclusion [SCI-8609] (#5588) 2023-06-13 14:47:28 +02:00
aignatov-bio
0a122b6416
Merge pull request #5587 from aignatov-bio/ai-sci-8540-update-top-navigation 
Refactor top navigation [SCI-8540]
 2023-06-13 14:13:25 +02:00
Anton
86e980f773 Updated top navigation [SCI-8540] 2023-06-13 14:12:41 +02:00
artoscinote
8b144fa33b
Merge pull request #5542 from G-Chubinidze/gc_SCI_8406 
(A) label (instead of icons) in front of titles of archived elements [SCI-8406]
 2023-06-13 12:17:32 +02:00
Anton
b434c8a2c7 Update css for team selection and search field [SCI-8540] 2023-06-13 11:52:14 +02:00
dependabot[bot]
b73382f959
Bump doorkeeper from 5.4.0 to 5.6.6 (#5585) 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.4.0 to 5.6.6.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.4.0...v5.6.6)

---
updated-dependencies:
- dependency-name: doorkeeper
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-06-13 11:49:04 +02:00
G-Chubinidze
9315190ffe
Merge branch 'develop' into gc_SCI_8406 2023-06-13 12:13:22 +04:00
Giga Chubinidze
673718f1db Breadcrumbs on label/protocol template page [SCI-8476] 2023-06-13 11:25:14 +04:00
Soufiane
606bdb118b
Prevent submitting forms multiple times [SCI-8560] (#5584) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-13 08:29:26 +02:00
Alex Kriuchykhin
3990661a78
Update Rails version to 6.1.7.3 (#5583) 2023-06-12 16:10:27 +02:00
aignatov-bio
7e8be82fd4
Merge pull request #5582 from aignatov-bio/ai-fix-icon-fonts-issues 
Fix icon fonts issues
 2023-06-12 15:07:17 +02:00
Anton
4c71ecced6 Fix icon fonts issues 2023-06-12 14:55:01 +02:00
artoscinote
91aab57914
Merge pull request #5580 from sboursen-scinote/sb_SCI-8545 
Improvement of dropdown in Assign to task modal [SCI-8545]
 2023-06-12 14:38:16 +02:00
aignatov-bio
85665a117e
Merge pull request #5581 from aignatov-bio/ai-sci-8537-update-left-menu 
Refactor left menu [SCI-8537]
 2023-06-12 14:33:20 +02:00
Anton
d64a166b83 Remove margin hack 2023-06-12 14:24:26 +02:00
Anton
16d4a09cfa Update left navigation 2023-06-12 14:23:26 +02:00
Soufiane
2e16302812
Team admin can see all projects in Navigator [SCI-8549] [SCI-8381] (#5575) 
Disable project links if team admin is missing read permission [SCI-8381]
 2023-06-12 12:55:32 +02:00
aignatov-bio
4c9aa2a1f5
Merge pull request #5572 from aignatov-bio/ai-sci-8539-navigator-ui-revamp 
Navigator ui revamp [SCI-8539][SCI-8467]
 2023-06-12 12:53:32 +02:00
Anton
5f55070fec Navigator ui revamp [SCI-8539][SCI-8467] 2023-06-12 11:53:24 +02:00
artoscinote
e57da37ec7
Merge pull request #5573 from G-Chubinidze/gc_SCI_8366 
New icons implementation [SCI-8366]
 2023-06-12 11:25:36 +02:00
Martin Artnik
7dfbc960e3 Font fix + default label icon fix [SCI-8366] 2023-06-12 11:20:33 +02:00
sboursen-scinote
43bf1cf0eb Add loading state to select_search [SCI-8545] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-12 10:49:31 +02:00
Alex Kriuchykhin
f0c2624179
Implement inventories export backend logic [SCI-8444] (#5578) 2023-06-12 10:29:17 +02:00
artoscinote
0e14b7de8a
Merge pull request #5544 from sboursen-scinote/sb_SCI-8498 
Activity from dropdown disappeared [SCI-8498]
 2023-06-09 13:19:52 +02:00
artoscinote
75a70ec080
Merge pull request #5576 from sboursen-scinote/sb_SCI-8532 
Automatically close the Assign from inventory window on task screen [SCI-8532]
 2023-06-09 10:29:32 +02:00
artoscinote
db0363416c
Merge pull request #5577 from sboursen-scinote/sb_SCI-8626 
Error at selecting one ZPL label template [SCI-8626]
 2023-06-09 10:29:24 +02:00
sboursen-scinote
ad78759393 Handle no action buttons in the toolbar edge case [SCI-8626] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-09 10:11:31 +02:00
Soufiane
77de460182
Due date flyout on dashboard calendar [SCI-8600] (#5554) 
* Change the scope of the DatePicker datetime format in global activities [SCI-8600]
 2023-06-09 09:24:32 +02:00
Martin Artnik
27c2850f49 More fixes for icons [SCI-8366] 2023-06-08 18:12:28 +02:00
Martin Artnik
9ece0e5865 Remove addon css [SCI-8366] 2023-06-08 17:36:43 +02:00
Martin Artnik
dcc30822f5 New icon tweaks & fixes [SCI-8366] 2023-06-08 17:33:50 +02:00
sboursen-scinote
154910602f Close the Assign from inventory window on success [SCI-8532] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-08 15:33:43 +02:00
G-Chubinidze
dc9d37226a
Update application.js.erb 2023-06-08 10:37:11 +04:00
Giga Chubinidze
a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04:00
Oleksii Kriuchykhin
7c84ecb108 Bump version to 1.27.2 2023-06-07 10:23:35 +02:00
artoscinote
164829fd7c
Fix issue where blur prevention is not turned off in assignment modal dropdown [SCI-8588] (#5570) 2023-06-07 09:52:57 +02:00