mlorb
|
547af538b3
|
Merge pull request #2856 from mlorb/ml-sci-5009
Update empty states for smart annotation results and dismiss button [SCI-5009]
|
2020-09-22 15:31:22 +02:00 |
|
aignatov-bio
|
f8a28f378e
|
Add shared inventories to smart annotation
|
2020-09-21 14:36:34 +02:00 |
|
Mojca Lorber
|
d9a78d20d7
|
Update empty states for smart annotation results and dismiss button
|
2020-09-18 08:50:01 +02:00 |
|
aignatov-bio
|
e5d3fac112
|
Merge branch 'features/smart-annotation-improvements' into develop
|
2020-09-17 14:52:51 +02:00 |
|
aignatov-bio
|
f11f54db33
|
Small fixes
|
2020-09-17 13:11:54 +02:00 |
|
aignatov-bio
|
86667feb6b
|
Add remembered state for smart annotation
|
2020-09-17 11:43:07 +02:00 |
|
aignatov-bio
|
14acf2b624
|
Add i18n
|
2020-09-15 14:47:57 +02:00 |
|
aignatov-bio
|
6dc4422d82
|
Fix markup
|
2020-09-15 11:56:44 +02:00 |
|
aignatov-bio
|
008563a7f4
|
Update user smart annotation
|
2020-09-11 13:00:13 +02:00 |
|
aignatov-bio
|
7a86bb47c5
|
Add styling and highligh
|
2020-09-09 14:17:19 +02:00 |
|
aignatov-bio
|
661220890f
|
Update error handling
|
2020-09-09 12:25:34 +02:00 |
|
aignatov-bio
|
f4a13a73cb
|
Refactor smart annotation front-end
|
2020-09-09 12:25:34 +02:00 |
|
Urban Rotnik
|
a259800590
|
Merge branch 'develop' into jg_sci_2228
|
2020-08-31 16:29:23 +02:00 |
|
Urban Rotnik
|
4eebfa5461
|
Controller action for card inline preview
|
2020-08-28 11:05:52 +02:00 |
|
Oleksii Kriuchykhin
|
bc4c18e585
|
Add secondary-navigation-title-name data hook [SCI-4859]
|
2020-08-27 11:33:26 +02:00 |
|
aignatov-bio
|
6245e19069
|
Merge pull request #2718 from biosistemika/master
Merge master to develop
|
2020-07-09 12:56:31 +02:00 |
|
Mojca Lorber
|
00b668a4ba
|
Change title size to h1
|
2020-07-08 13:02:47 +02:00 |
|
aignatov-bio
|
323929b270
|
Add restore/delete buttons
|
2020-06-18 14:09:29 +02:00 |
|
aignatov-bio
|
95ae8215a7
|
Fix MarvinJS modal header
|
2020-06-16 10:28:43 +02:00 |
|
aignatov-bio
|
dd58fc4199
|
Fix i18n
|
2020-06-04 18:41:45 +02:00 |
|
aignatov-bio
|
012b7b3d23
|
Add switch for active/archive repository view
|
2020-06-04 18:41:45 +02:00 |
|
aignatov-bio
|
aaff5eb67f
|
Add name order for porject/experiment/task sidebar
|
2020-05-27 13:31:00 +02:00 |
|
Mojca Lorber
|
94dc314c73
|
Hide hamburger menu on login screen
|
2020-05-25 10:39:35 +02:00 |
|
aignatov-bio
|
3287070df7
|
Improve search through assigned tasks
|
2020-05-22 14:36:28 +02:00 |
|
aignatov-bio
|
d16930e987
|
Add private tasks to assigned task list
|
2020-05-20 17:23:48 +02:00 |
|
aignatov-bio
|
acb1b392fc
|
Merge pull request #2564 from aignatov-bio/ai-sci-4632-remove-task-inventory-tab
Remove inventory tab from task and routes to inventory page [SCI-4632]
|
2020-05-18 11:16:17 +02:00 |
|
Urban Rotnik
|
a2ade6e0ec
|
Merge branch 'develop' into features/new-task-layout
|
2020-05-15 14:27:56 +02:00 |
|
aignatov-bio
|
bac98bdbdc
|
Remove inventory tab from task and routes to inventory page
|
2020-05-14 22:10:13 +02:00 |
|
aignatov-bio
|
2728df5bac
|
Move helper method to my_module_helper
|
2020-05-08 11:56:29 +02:00 |
|
aignatov-bio
|
8076d8f464
|
Create helper for partial
|
2020-05-07 12:51:18 +02:00 |
|
aignatov-bio
|
b9c5089c2b
|
Add search to assigned tasks dropdown
|
2020-04-28 12:41:59 +02:00 |
|
Urban Rotnik
|
8fa024ed10
|
Remove all tooltips from HTML
|
2020-04-28 12:30:43 +02:00 |
|
aignatov-bio
|
0604815c00
|
Add assigned task dropdown to repository
|
2020-04-24 15:43:10 +02:00 |
|
aignatov-bio
|
5705bd8497
|
Fix caching issue for sidebar
|
2020-03-31 22:12:38 +02:00 |
|
Alex Kriuchykhin
|
92279d07ad
|
Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state
Refactor sidebar [SCI-4380]
|
2020-03-30 09:56:51 +02:00 |
|
aignatov-bio
|
a7e4083ef1
|
Fix team dropdown
|
2020-03-25 12:31:47 +01:00 |
|
aignatov-bio
|
5004270c22
|
Teams dropdown apears everytime
|
2020-03-23 19:42:36 +01:00 |
|
Mojca Lorber
|
94d5dcf4a9
|
Add data hook
|
2020-03-18 10:50:09 +01:00 |
|
Mojca Lorber
|
7e36a4e357
|
Small support dropdown fixes
|
2020-03-17 15:44:57 +01:00 |
|
Miha Mencin
|
26b687f2e6
|
Merge pull request #2460 from biosistemika/features/dashboard
Features/dashboard
|
2020-03-10 18:06:23 +01:00 |
|
Miha Mencin
|
62b934f012
|
Merge branch 'develop' into features/dashboard
|
2020-03-09 09:56:32 +01:00 |
|
Mojca Lorber
|
6bf191d124
|
Remove academy link from navigation and move about modal to support menu
|
2020-03-06 14:36:22 +01:00 |
|
aignatov-bio
|
e46e496702
|
Add user check to invite user modal
|
2020-03-03 10:30:04 +01:00 |
|
Oleksii Kriuchykhin
|
73623da02c
|
Merge branch 'develop' into features/dashboard
|
2020-02-28 16:46:56 +01:00 |
|
aignatov-bio
|
8b273acaca
|
Update all sidebars
|
2020-02-28 14:03:08 +01:00 |
|
aignatov-bio
|
9e15d1ea42
|
Refactor experiment sidebar
|
2020-02-27 16:04:44 +01:00 |
|
Oleksii Kriuchykhin
|
62c19f7c02
|
Add invite users to the team permission check [SCI-4381]
|
2020-02-26 17:25:38 +01:00 |
|
aignatov-bio
|
8e05908753
|
Small fixes
|
2020-02-25 17:19:11 +01:00 |
|
aignatov-bio
|
cf4dbd5ff4
|
Add calendar widget
|
2020-02-20 17:02:38 +01:00 |
|
aignatov-bio
|
5c0a769f87
|
General dashboard layout
|
2020-02-13 13:50:29 +01:00 |
|
mlorb
|
49bfb603c8
|
Merge pull request #2357 from mlorb/ml-sci-4130
Sidebar redesign [SCI-4130]
|
2020-02-04 09:55:00 +01:00 |
|
mlorb
|
7ad3527338
|
Merge pull request #2379 from urbanrotnik/ur-sci-4274-visual-fixes
Visual fixes [SCI-4274]
|
2020-02-03 09:44:48 +01:00 |
|
Urban Rotnik
|
3db48c44f7
|
Add ordered scope
|
2020-01-30 13:47:14 +01:00 |
|
Urban Rotnik
|
1bb54d20cf
|
Teams ordering fixed
|
2020-01-30 13:46:04 +01:00 |
|
Urban Rotnik
|
765a577669
|
Ellipsis with css for Sidebar
|
2020-01-29 13:22:35 +01:00 |
|
Urban Rotnik
|
6c50b514f3
|
Put Academy icon back, resize team switch
|
2020-01-27 17:15:22 +01:00 |
|
Urban Rotnik
|
71a8a8655f
|
Remove Academy icon
|
2020-01-27 14:52:19 +01:00 |
|
Mojca Lorber
|
f5d245e7cc
|
Sidebar redesign
|
2020-01-24 13:22:04 +01:00 |
|
Mojca Lorber
|
981f8678df
|
Fix alerts style
|
2020-01-21 15:21:40 +01:00 |
|
aignatov-bio
|
e022f7a096
|
Fix small css issues
|
2020-01-20 15:48:51 +01:00 |
|
Mojca Lorber
|
772118d246
|
change html structure for flash msg, change columns buttons
|
2020-01-20 14:02:42 +01:00 |
|
Alex Kriuchykhin
|
f1babb2237
|
Merge pull request #2279 from okriuchykhin/ok_SCI_4000
Fix sidebar update for inline editing [SCI-4000]
|
2020-01-10 10:34:27 +01:00 |
|
Alex Kriuchykhin
|
9ab07af87b
|
Merge pull request #2282 from okriuchykhin/ok_SCI_4149
Disable comment edit mode if comment is not editable [SCI-4149]
|
2020-01-09 15:06:04 +01:00 |
|
Oleksii Kriuchykhin
|
1624f9d5ab
|
Disable comment edit mode if comment is not editable [SCI-4149]
|
2020-01-08 12:32:59 +01:00 |
|
aignatov-bio
|
68646276f5
|
Replace bootstrap styles for button
|
2020-01-07 16:13:34 +01:00 |
|
Oleksii Kriuchykhin
|
16b591b110
|
Fix sidebar update for inline editing [SCI-4000]
|
2020-01-06 16:07:23 +01:00 |
|
aignatov-bio
|
18a8be43f5
|
Add new logo
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
a281f09e7f
|
Add reports and missed modals
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
ef3814ccec
|
Add new buttons to protocols, tasks, experiments, projects
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
5ba8e6507e
|
Merge branch 'release-1-17-8' into ai-sci-fix-comment-error
|
2019-12-10 10:36:30 +01:00 |
|
aignatov-bio
|
63edd3e877
|
Remove edit initialization from view mode
|
2019-12-06 13:26:47 +01:00 |
|
Oleksii Kriuchykhin
|
7a89cae56f
|
Fix TinyMCE images and avatars for export all [SCI-4107]
|
2019-12-05 13:27:17 +01:00 |
|
aignatov-bio
|
b9a34fa809
|
Fix placeholder for authors
|
2019-11-15 16:23:48 +01:00 |
|
aignatov-bio
|
a9690482d1
|
Add autosave feature to text fields
|
2019-11-12 11:26:18 +01:00 |
|
Mojca Lorber
|
16eddc0ad0
|
Save on click away, inline editing
|
2019-11-03 14:59:30 +01:00 |
|
aignatov-bio
|
9950a23188
|
Replace base64 avatars with url
|
2019-10-22 12:27:13 +02:00 |
|
Alex Kriuchykhin
|
53caaf647b
|
Merge pull request #2080 from okriuchykhin/ok_SCI_3891
Move file preview generation to delayed job [SCI-3891]
|
2019-09-27 10:50:21 +02:00 |
|
Anton Ignatov
|
e01c438055
|
Fix padding for marvinjs modal
|
2019-09-24 11:02:15 +02:00 |
|
Oleksii Kriuchykhin
|
aabeeec95a
|
Move file preview generation to delayed job [SCI-3891]
|
2019-09-23 21:07:03 +02:00 |
|
Anton Ignatov
|
68994a77c8
|
Fix file preview in inventory
|
2019-09-18 11:21:33 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
aignatov-bio
|
1f12a63a25
|
Fix counter on task inventory and failing test (#2043)
|
2019-09-10 13:51:37 +02:00 |
|
mlorb
|
ba5bebedb2
|
change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022)
|
2019-09-02 10:30:29 +02:00 |
|
aignatov-bio
|
e2ad383c69
|
Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998)
* Fix ux for task inventory dropdown and big task title
* Fix markup
|
2019-08-21 10:39:37 +02:00 |
|
Urban Rotnik
|
89f289660b
|
Add share_with_all feature to service, add new activities
|
2019-08-14 11:03:15 +02:00 |
|
aignatov-bio
|
737f9e572c
|
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976)
* Replace marvinJS logo and fix some merge issues
* Fix tests
|
2019-08-13 11:04:19 +02:00 |
|
Oleksii Kriuchykhin
|
c352a73d79
|
ActiveStorage fixies after latest master merge [SCI-3757]
|
2019-08-09 14:56:00 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Oleksii Kriuchykhin
|
b4f632dba8
|
Remove dowload endpoint from assets controller [SCI-3680]
|
2019-08-07 15:21:41 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +02:00 |
|
Anton Ignatov
|
1e8663548e
|
Add MarvinJS assets to TinyMCE
|
2019-07-16 13:40:54 +02:00 |
|
aignatov-bio
|
a8623002e6
|
Small UI changes [SCI-3699] (#1935)
* Small ui changes
* Markup fix
* Add class for addons
|
2019-07-15 13:28:20 +02:00 |
|
Anton Ignatov
|
7831b0a089
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 15:00:07 +02:00 |
|
Anton Ignatov
|
57a273d5d0
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 11:34:41 +02:00 |
|
aignatov-bio
|
26ef970a1e
|
Add academy button (#1924)
|
2019-07-12 11:15:34 +02:00 |
|
Oleksii Kriuchykhin
|
64b7a5646a
|
Implement custom document file previewer [SCI-3677]
|
2019-07-10 14:37:23 +02:00 |
|
mlorb
|
23270393b0
|
Merge branch 'master' into ml-sci-3634
|
2019-07-09 14:38:00 +02:00 |
|
aignatov-bio
|
1a75a31647
|
Remove webinar button [SCI-3664] (#1906)
* Remove webinar button
* Remove constants and i18n
|
2019-07-09 14:01:09 +02:00 |
|
Mojca Lorber
|
989c10872c
|
Fixes visual bugs on protocols.io and home page
|
2019-07-04 18:22:51 +02:00 |
|
Oleksii Kriuchykhin
|
4ea6b56582
|
Fix Step and Result file previews [SCI-3539]
|
2019-07-01 23:30:20 +02:00 |
|