Urban Rotnik
|
6853caa0c8
|
Merge pull request #2760 from aignatov-bio/ai-sci-4894-small-2fa-fixes
Small 2fa fixes [SCI-4894]
|
2020-08-04 11:23:08 +02:00 |
|
Urban Rotnik
|
cce76f6f0f
|
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults
Add ordering for result page [SCI-4895]
|
2020-08-04 11:17:43 +02:00 |
|
Alex Kriuchykhin
|
e965844a9e
|
Merge pull request #2755 from aignatov-bio/ai-sci-4837-implement-new-statuses-in-preports
Add new statuses to reports [SCI-4837]
|
2020-08-04 09:49:55 +02:00 |
|
Alex Kriuchykhin
|
a9bc5b664a
|
Merge pull request #2750 from aignatov-bio/ai-sci-4835-add-status-flow-modal
Add modal for status flow [SCI-4835]
|
2020-08-04 09:47:40 +02:00 |
|
Urban Rotnik
|
aaae33e603
|
Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard
Add start date to current task dashboard filter [SCI-4766]
|
2020-08-03 11:56:24 +02:00 |
|
Urban Rotnik
|
ac3c06d882
|
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items
Add export for assigned items [SCI-4748]
|
2020-08-03 11:30:31 +02:00 |
|
aignatov-bio
|
536367362c
|
Add statuses to dashboard filters
|
2020-07-31 10:59:10 +02:00 |
|
aignatov-bio
|
2f5231e832
|
Add start date to current task dashboard filter
|
2020-07-29 16:09:23 +02:00 |
|
aignatov-bio
|
15b5f9bb68
|
Add ordering for result page
|
2020-07-28 15:39:29 +02:00 |
|
aignatov-bio
|
f09ead703c
|
Fix markup
|
2020-07-28 09:54:47 +02:00 |
|
aignatov-bio
|
b644950e4e
|
Fix I18n markup
|
2020-07-28 09:53:35 +02:00 |
|
aignatov-bio
|
68fc6ec58a
|
Add sorting my module statuses
|
2020-07-27 16:36:21 +02:00 |
|
aignatov-bio
|
968249c6d8
|
Fix tests
|
2020-07-27 13:48:21 +02:00 |
|
aignatov-bio
|
9f7efe6068
|
Add backend for status flow show
|
2020-07-27 13:48:21 +02:00 |
|
aignatov-bio
|
6bd12e0397
|
Add modal for status flow
|
2020-07-27 13:48:21 +02:00 |
|
aignatov-bio
|
33e3e3d301
|
Small 2fa fixes
|
2020-07-27 13:42:51 +02:00 |
|
Oleksii Kriuchykhin
|
94588e4698
|
Refactor task archive and move permissions [SCI-4817]
|
2020-07-24 17:00:42 +02:00 |
|
Urban Rotnik
|
025378cd0e
|
Fix translations and JS
|
2020-07-23 15:53:46 +02:00 |
|
Alex Kriuchykhin
|
d4408f6af7
|
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results
Add pagination to results page [SCI-4732]
|
2020-07-23 14:45:10 +02:00 |
|
aignatov-bio
|
a0d19b5d98
|
Add new statuses to reports
|
2020-07-23 14:24:30 +02:00 |
|
Urban Rotnik
|
512d6f3229
|
Add actions for update status, clean old complete actions
|
2020-07-22 16:12:34 +02:00 |
|
Urban Rotnik
|
aacee14fc6
|
Add Status button
|
2020-07-22 15:30:47 +02:00 |
|
aignatov-bio
|
1d3055011f
|
Merge branch 'features/tinymce-tables' into develop
|
2020-07-22 13:41:43 +02:00 |
|
aignatov-bio
|
53d62b0310
|
Fix tests
|
2020-07-22 13:16:27 +02:00 |
|
aignatov-bio
|
ddfe8231d8
|
Merge branch 'features/2fa' into develop
|
2020-07-22 11:56:36 +02:00 |
|
Alex Kriuchykhin
|
c13730ee8d
|
Merge pull request #2740 from mlorb/ml-sci-4833
Implement Status labels on a Task card [SCI-4823]
|
2020-07-22 11:32:45 +02:00 |
|
Oleksii Kriuchykhin
|
7fd004baa8
|
Prepare database structure and relations for statuses phase one [SCI-4825]
|
2020-07-17 18:04:09 +02:00 |
|
aignatov-bio
|
e69e3ea8d3
|
Add export for assigned items
|
2020-07-17 15:17:09 +02:00 |
|
Mojca Lorber
|
10e607c281
|
Implement Status labels on a Task card
|
2020-07-17 14:48:45 +02:00 |
|
aignatov-bio
|
7c4bfad09b
|
Add pagination to results page
|
2020-07-16 15:47:19 +02:00 |
|
aignatov-bio
|
f77902f6d4
|
Add tinymce table support to docx
|
2020-07-15 09:44:25 +02:00 |
|
aignatov-bio
|
39b5651283
|
Revert FontAwesome in reports to CDN
|
2020-07-14 09:44:03 +02:00 |
|
Alex Kriuchykhin
|
8dd478ad61
|
Merge pull request #2730 from aignatov-bio/ai-sci-4874-improve-pdf-reports
Improve pdf reports [SCI-4874]
|
2020-07-13 17:02:10 +02:00 |
|
aignatov-bio
|
c592954400
|
Add UX
|
2020-07-13 16:05:23 +02:00 |
|
Mojca Lorber
|
212ba76c16
|
Fix Settings pages titles
|
2020-07-13 14:51:51 +02:00 |
|
aignatov-bio
|
f8c6d9f260
|
Fix markup
|
2020-07-13 14:31:57 +02:00 |
|
aignatov-bio
|
a7fac38fcb
|
Improve pdf reports
|
2020-07-13 14:29:59 +02:00 |
|
aignatov-bio
|
7d20bf6fea
|
Add recovery screen
|
2020-07-13 09:51:04 +02:00 |
|
aignatov-bio
|
fef6e5f1db
|
Add recovery strategy for 2fa
|
2020-07-09 17:01:00 +02:00 |
|
Urban Rotnik
|
721f3accbe
|
Merge pull request #2694 from urbanrotnik/ur-sci-4790
Show assigned users modal also for view only [SCI-4790]
|
2020-07-09 16:12:20 +02:00 |
|
Urban Rotnik
|
4003608c7d
|
Fix style
|
2020-07-09 15:43:08 +02:00 |
|
Urban Rotnik
|
d2415c3b1d
|
Show assigned users modal also for view
|
2020-07-09 15:11:53 +02:00 |
|
mlorb
|
3f44f44cbe
|
Merge pull request #2711 from mlorb/ml-sci-4810
Hide inventory buttons and fix css of disabled button [SCI-4810]
|
2020-07-09 15:11:02 +02:00 |
|
Urban Rotnik
|
b11f166c38
|
Fix cucumber tests
|
2020-07-09 13:14:07 +02:00 |
|
Urban Rotnik
|
d92bcee3f6
|
Helpers for first elements
|
2020-07-09 13:14:06 +02:00 |
|
Miha Mencin
|
b357d7c0e6
|
Merge pull request #2719 from urbanrotnik/ur-sci-4806-missing-icon
Add icon before archived items [SCI-4806]
|
2020-07-09 12:58:06 +02:00 |
|
aignatov-bio
|
6245e19069
|
Merge pull request #2718 from biosistemika/master
Merge master to develop
|
2020-07-09 12:56:31 +02:00 |
|
Urban Rotnik
|
950f65b90e
|
Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout
Improve report layout [SCI-4771]
|
2020-07-09 11:48:33 +02:00 |
|
mlorb
|
d9038e6f7f
|
Merge branch 'develop' into ml-sci-4810
|
2020-07-09 11:46:54 +02:00 |
|
Urban Rotnik
|
7661cea379
|
Add icon before archived items
|
2020-07-09 11:34:09 +02:00 |
|
Miha Mencin
|
c68aa5c875
|
Merge pull request #2716 from mlorb/ml-sci-4567
Change title size to h1 [SCI-4567]
|
2020-07-09 11:19:02 +02:00 |
|
mlorb
|
efbef2c876
|
Merge pull request #2384 from mlorb/ml-sci-4261
Clean up controllers for manage repository columns [SCI-4261]
|
2020-07-09 09:18:23 +02:00 |
|
Mojca Lorber
|
f64172f787
|
Revert repository archived items title
|
2020-07-09 09:17:02 +02:00 |
|
aignatov-bio
|
b2a42c182b
|
Merge pull request #2717 from aignatov-bio/ai-sci-4844-fix-dropdown-options-for-active-repository
Small archived repositories fixes [SCI-4844]
|
2020-07-09 08:56:21 +02:00 |
|
aignatov-bio
|
135ac487d0
|
Small archived repositories fixes
|
2020-07-08 13:42:27 +02:00 |
|
Mojca Lorber
|
00b668a4ba
|
Change title size to h1
|
2020-07-08 13:02:47 +02:00 |
|
Urban Rotnik
|
5d067077b1
|
Add logo and timestamp to PDF and Doc reports
|
2020-07-08 10:48:29 +02:00 |
|
aignatov-bio
|
a994c75885
|
Merge pull request #2700 from aignatov-bio/ai-sci-4801-inventory-list-sorting-date-issue
Fix date columns sorting in repositories list [SCI-4801]
|
2020-07-08 09:30:10 +02:00 |
|
aignatov-bio
|
004a7e3943
|
Merge pull request #2705 from aignatov-bio/ai-sci-4808-update-css-for-inventory-modals
Update inventory modals CSS [SCI-4808]
|
2020-07-08 09:29:02 +02:00 |
|
aignatov-bio
|
88c092dc98
|
Add i18n and constants
|
2020-07-07 15:59:02 +02:00 |
|
Mojca Lorber
|
9642e92fdc
|
Hide inventory buttons and fix css of disabled button
|
2020-07-07 13:53:31 +02:00 |
|
aignatov-bio
|
7a9a25e6a9
|
Add 2fa wizzard tabs
|
2020-07-07 13:17:17 +02:00 |
|
aignatov-bio
|
be3a1994f8
|
Add basic UX to 2FA
|
2020-07-07 13:09:48 +02:00 |
|
aignatov-bio
|
13f7653667
|
Merge branch 'develop' into features/2fa
|
2020-07-07 13:05:45 +02:00 |
|
aignatov-bio
|
6352a4ba9b
|
Update inventory modals
|
2020-07-06 12:47:42 +02:00 |
|
aignatov-bio
|
d226bb5622
|
Fix date columns sorting in repositories list
|
2020-07-02 14:35:48 +02:00 |
|
Urban Rotnik
|
1bf8198129
|
Hide checkbox column when user is not admin
|
2020-07-02 14:29:18 +02:00 |
|
aignatov-bio
|
4b9881e31e
|
Add 2fa to user settings page
|
2020-07-01 13:25:06 +02:00 |
|
Urban Rotnik
|
62a4a5f203
|
Add 2fa login
|
2020-07-01 12:46:26 +02:00 |
|
Mojca Lorber
|
22b71bc9cb
|
Merge branch 'develop' into ml-sci-4261
|
2020-06-30 13:47:32 +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 |
|
Oleksii Kriuchykhin
|
7ea577d8d4
|
Merge branch 'features/inventory-archiving' into develop
|
2020-06-24 14:04:54 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
Mojca Lorber
|
be19190ff1
|
Revert default_scope for active repositories
|
2020-06-22 14:57:35 +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
|
6f2d5b359e
|
Add action buttons to repository index
|
2020-06-19 15:54:45 +02:00 |
|
Mojca Lorber
|
6e8062179c
|
Implement archiving and restoring of whole inventories
|
2020-06-18 18:07:23 +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
|
123375f494
|
Update scopes in reports
|
2020-06-18 09:33:12 +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 |
|
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 |
|
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 |
|
aignatov-bio
|
db35da0cee
|
Add archiving column to datatable helper
|
2020-06-11 12:48:31 +02:00 |
|
Urban Rotnik
|
c7d6c4d60e
|
Add repository_rows restoring and archiving actions on FE
|
2020-06-09 22:16:55 +02:00 |
|
aignatov-bio
|
2b9062ac92
|
Add checkbox selector to datatable
|
2020-06-09 13:16:50 +02:00 |
|
aignatov-bio
|
15de84ff2f
|
Not include marvinJS library, if marvinJS disabled
|
2020-06-08 09:59:26 +02:00 |
|
Alex Kriuchykhin
|
f521531fd5
|
Merge pull request #2638 from okriuchykhin/ok_SCI_4571
Clear the obsolete code for assigning inventory items to the task [SCI-4571]
|
2020-06-08 09:47:56 +02:00 |
|
aignatov-bio
|
dd58fc4199
|
Fix i18n
|
2020-06-04 18:41:45 +02:00 |
|
aignatov-bio
|
66a77d8de9
|
Add sidebar reload on view change
|
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 |
|
Urban Rotnik
|
69d086ba32
|
Scope snapshots to project
|
2020-06-03 22:58:22 +02:00 |
|
Oleksii Kriuchykhin
|
48865c8cea
|
Clear the obsolete code for assiging inventory items to the task [SCI-4571]
|
2020-06-03 22:54:45 +02:00 |
|
Oleksii Kriuchykhin
|
6afebdc5da
|
Remove inventory links of unshared inventory [SCI-4715]
|
2020-06-01 17:50:31 +02:00 |
|
aignatov-bio
|
f963608996
|
Add I18n and tests
|
2020-06-01 14:34:04 +02:00 |
|
aignatov-bio
|
8f3c7fa9aa
|
Merge pull request #2627 from aignatov-bio/ai-sci-4549-fix-shared-inventory-icon
Fix shared inventory icon [SCI-4549]
|
2020-06-01 10:28:07 +02:00 |
|
aignatov-bio
|
aee75a2f83
|
Add repository list view
|
2020-06-01 10:24:03 +02:00 |
|
Alex Kriuchykhin
|
b688b0c335
|
Merge pull request #2616 from okriuchykhin/ok_SCI_4698_v2
Fix handling of deleted repositories in reports [SCI-4698]
|
2020-05-29 16:51:17 +02:00 |
|
Oleksii Kriuchykhin
|
d774a82762
|
Fix handling of snapshots of deleted repositories in reports [SCI-4698]
|
2020-05-29 16:30:27 +02:00 |
|
aignatov-bio
|
1430ca5ae9
|
Fix shared inventory icon
|
2020-05-29 13:17:07 +02:00 |
|
Oleksii Kriuchykhin
|
7a95355e81
|
Add extra check for repository presence in report [SCI-4698]
|
2020-05-29 11:39:07 +02:00 |
|
Alex Kriuchykhin
|
be8c7e01e2
|
Merge pull request #2622 from aignatov-bio/ai-sci-4699-show-selected-snapshot-in-sidebar
Show selected snapshot in sidebar [SCI-4699]
|
2020-05-29 11:14:52 +02:00 |
|
Alex Kriuchykhin
|
26449fdfe2
|
Merge pull request #2625 from okriuchykhin/ok_SCI_4712
Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712]
|
2020-05-29 09:52:08 +02:00 |
|
Oleksii Kriuchykhin
|
8027cc6a49
|
Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712]
|
2020-05-28 16:15:05 +02:00 |
|
aignatov-bio
|
368ee8a689
|
Show selected snapshot in sidebar
|
2020-05-28 15:18:26 +02:00 |
|
Mojca Lorber
|
285280827a
|
Refactor repository column base controller
|
2020-05-28 12:18:46 +02:00 |
|
Mojca Lorber
|
c673e27109
|
Merge branch 'develop' into ml-sci-4261
|
2020-05-28 08:18:24 +02:00 |
|
aignatov-bio
|
aaff5eb67f
|
Add name order for porject/experiment/task sidebar
|
2020-05-27 13:31:00 +02:00 |
|
Oleksii Kriuchykhin
|
b430d507cf
|
Fix handling of deleted repositories in reports [SCI-4698]
|
2020-05-27 12:15:19 +02:00 |
|
aignatov-bio
|
15f58be1c2
|
Fix snapshot date creation
|
2020-05-26 15:59:49 +02:00 |
|
Miha Mencin
|
4b7b3a8622
|
Merge pull request #2607 from biosistemika/SCI-4674-tehnician-snapshots-permissions
[SCI-4674] Fix a typo
|
2020-05-25 17:30:19 +02:00 |
|
Miha Mencin
|
55aac63fba
|
Fix a typo
|
2020-05-25 17:28:36 +02:00 |
|
Miha Mencin
|
79ba0b3708
|
Merge pull request #2605 from biosistemika/SCI-4674-tehnician-snapshots-permissions
SCI-4674 allow tehnician to create, delete and select snapshot
|
2020-05-25 16:55:33 +02:00 |
|
Miha Mencin
|
77e1feda97
|
SCI-4674 name permissions more properly
|
2020-05-25 16:29:00 +02:00 |
|
Miha Mencin
|
5994e8c6a6
|
SCI-4674 create special permissions for snapshots on task
|
2020-05-25 15:49:31 +02:00 |
|
Miha Mencin
|
cd70d9c5a6
|
SCI-4674 allow tehnician to create, delete and select snapshot
|
2020-05-25 15:03:37 +02:00 |
|
Urban Rotnik
|
df8fe20d03
|
Keep reportElements up to date with active snapshots and repositories
|
2020-05-25 13:19:33 +02:00 |
|
Urban Rotnik
|
359517eb17
|
Add deleted repositories to report
|
2020-05-25 13:19:30 +02:00 |
|
Urban Rotnik
|
2b493ce6f6
|
Refactor assigned rows
|
2020-05-25 13:19:29 +02:00 |
|
Urban Rotnik
|
9536939b3b
|
Show snapshot rows in report
|
2020-05-25 13:19:28 +02:00 |
|
Mojca Lorber
|
94dc314c73
|
Hide hamburger menu on login screen
|
2020-05-25 10:39:35 +02:00 |
|
mlorb
|
384ec40c4e
|
Merge pull request #2542 from mlorb/ml-sci-4582
Task details description corrections and some changes of locales [SCI-4582]
|
2020-05-25 09:10:37 +02:00 |
|
aignatov-bio
|
100108bd43
|
Merge pull request #2596 from aignatov-bio/ai-sci-4642-improve-assigned-task-search
Improve search through assigned tasks [SCI-4642]
|
2020-05-25 09:09:19 +02:00 |
|
Oleksii Kriuchykhin
|
c98b042585
|
Improve handling of unassigned inventories with existing snapshots [SCI-4661]
|
2020-05-22 17:36:04 +02:00 |
|
aignatov-bio
|
230ec487ba
|
Make snapshots versions buttons full size clickable
|
2020-05-22 17:16:20 +02:00 |
|
aignatov-bio
|
ce53235cb9
|
Merge pull request #2592 from aignatov-bio/ai-sci-4621-fix-order-icon-position-in-simple-view
Fix ordering in simple table view [SCI-4621]
|
2020-05-22 16:52:45 +02:00 |
|
Urban Rotnik
|
a754e5765d
|
Merge pull request #2595 from urbanrotnik/ur-sci-4670-missing-button
New step missing button [SCI-4670]
|
2020-05-22 15:33:58 +02:00 |
|
aignatov-bio
|
cbc578f84b
|
Fix snapshot name column id
|
2020-05-22 15:10:21 +02:00 |
|
aignatov-bio
|
3287070df7
|
Improve search through assigned tasks
|
2020-05-22 14:36:28 +02:00 |
|
Urban Rotnik
|
9d3874e343
|
Add margin to keywords container
|
2020-05-22 14:23:03 +02:00 |
|
Urban Rotnik
|
1c2883414b
|
Bring newStep top button back
|
2020-05-22 12:29:14 +02:00 |
|
Urban Rotnik
|
a1fa0b4e05
|
Add check for button visibility
|
2020-05-22 12:02:38 +02:00 |
|
Urban Rotnik
|
a9bed41ff5
|
Remove obsolete html message
|
2020-05-22 10:33:13 +02:00 |
|
aignatov-bio
|
0aa1c32813
|
Fix ordering in simple table view
|
2020-05-21 16:51:07 +02:00 |
|
aignatov-bio
|
d3781a7048
|
Merge pull request #2588 from aignatov-bio/ai-sci-4660-change-assigned-private-task-view
Add private tasks to assigned task list [SCI-4660]
|
2020-05-21 12:57:59 +02:00 |
|
Mojca Lorber
|
12982260b7
|
Fix css hover effects
|
2020-05-21 08:37:40 +02:00 |
|
Oleksii Kriuchykhin
|
f2043f111b
|
Change display of the live version for a deleted inventory [SCI-4659]
|
2020-05-20 21:50:39 +02:00 |
|
aignatov-bio
|
d16930e987
|
Add private tasks to assigned task list
|
2020-05-20 17:23:48 +02:00 |
|
Mojca Lorber
|
e2959fec32
|
Merge branch 'develop' into ml-sci-4582
|
2020-05-20 10:37:33 +02:00 |
|
Urban Rotnik
|
431bd0c53b
|
Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix
Fonts size update [SCI-4650]
|
2020-05-19 14:55:22 +02:00 |
|
mlorb
|
7cbbcff86a
|
Merge pull request #2576 from mlorb/ml-sci-4619
Fix manage permissions on views [SCI-4619]
|
2020-05-19 14:29:11 +02:00 |
|
Urban Rotnik
|
ac4532eea3
|
Update fonts
|
2020-05-19 14:14:58 +02:00 |
|
aignatov-bio
|
c00b96ff7e
|
Merge pull request #2577 from aignatov-bio/ai-sci-4646-fix-task-sections-collapse-animation
Fix collapse animation for task sections [SCI-4646]
|
2020-05-19 10:31:36 +02:00 |
|
Alex Kriuchykhin
|
afdd6fd149
|
Merge pull request #2572 from okriuchykhin/ok_SCI_4629
Prevent the inventory items editing while snapshot is being created [SCI-4629]
|
2020-05-19 10:10:34 +02:00 |
|
aignatov-bio
|
9f4457642d
|
Fix collapse animation for task sections
|
2020-05-18 16:01:26 +02:00 |
|
Mojca Lorber
|
6b6fba591e
|
Fix manage permissions on views
|
2020-05-18 15:54:32 +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 |
|
aignatov-bio
|
f2d81cb199
|
Merge pull request #2570 from aignatov-bio/ai-sci-4617-make-snapshot-creation-text-switchable
Make snapshot creation info text switchable [SCI-4617]
|
2020-05-18 11:15:46 +02:00 |
|
Oleksii Kriuchykhin
|
c0521c3ca7
|
Prevent the inventory items editing while snapshot is being created [SCI-4629]
|
2020-05-15 17:46:59 +02:00 |
|
aignatov-bio
|
bc81a48b00
|
Make snapshot creation info text switchable
|
2020-05-15 14:44:26 +02:00 |
|
Urban Rotnik
|
a2ade6e0ec
|
Merge branch 'develop' into features/new-task-layout
|
2020-05-15 14:27:56 +02:00 |
|
aignatov-bio
|
dc2caca4f3
|
Small css fixes and test fix
|
2020-05-15 11:04:17 +02:00 |
|
mlorb
|
dbd03a09ef
|
Merge pull request #2565 from mlorb/ml-sci-4511
Add New Task layout Collapsed/Expanded States saving [SCI-4511]
|
2020-05-15 09:23:05 +02:00 |
|
Mojca Lorber
|
4c15c89cf5
|
Add New Task layout Collapsed/Expanded States saving
|
2020-05-15 00:49:23 +02:00 |
|
aignatov-bio
|
51e3c70a4d
|
Merge pull request #2563 from aignatov-bio/ai-sci-4638-fix-step-content-aligment
Fix align for step content [SCI-4638]
|
2020-05-14 22:10:50 +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
|
443c301ca1
|
Fix align for step content
|
2020-05-14 21:53:00 +02:00 |
|
aignatov-bio
|
e49d2dfbae
|
Merge pull request #2546 from aignatov-bio/ai-sci-4605-some-inventories-task-corrections
Small task inventories corrections [SCI-4605]
|
2020-05-14 16:45:45 +02:00 |
|
aignatov-bio
|
ce1540aaa9
|
Small task inventories corrections
|
2020-05-14 16:41:02 +02:00 |
|
aignatov-bio
|
309f8c1a3d
|
Small snapshots CSS corrections
|
2020-05-14 16:29:50 +02:00 |
|
aignatov-bio
|
8f946c45c3
|
Merge pull request #2553 from aignatov-bio/ai-sci-4518-optimize-task-mobile-view
Small CSS improvments for mobile [SCI-4518]
|
2020-05-14 14:20:40 +02:00 |
|
aignatov-bio
|
9b685fdaa6
|
Merge pull request #2554 from aignatov-bio/ai-sci-4613-add-icon-to-cancel-button
Add icon to cancel button [SCI-4613]
|
2020-05-14 13:19:20 +02:00 |
|
aignatov-bio
|
445f55acc7
|
Merge pull request #2555 from aignatov-bio/ai-sci-4598-change-task-details-to-onclick
Replace bootstrap popover with bootstrap dropdown [SCI-4598]
|
2020-05-14 13:19:08 +02:00 |
|
Oleksii Kriuchykhin
|
ba1661b40f
|
Fix handling of deleted repositories for snapshots [SCI-4596]
|
2020-05-13 18:00:56 +02:00 |
|
Oleksii Kriuchykhin
|
c74fa3c244
|
Make snapshots selectable [SCI-4596]
|
2020-05-13 17:58:05 +02:00 |
|
aignatov-bio
|
8447a13afd
|
Replace bootstrap popover with bootstrap dropdown
|
2020-05-13 12:20:25 +02:00 |
|
aignatov-bio
|
f6b239c144
|
Add icon to cancel button
|
2020-05-13 11:09:19 +02:00 |
|
aignatov-bio
|
bd742d388d
|
Small CSS improvments for mobile
|
2020-05-13 10:58:40 +02:00 |
|
aignatov-bio
|
8e20dccc66
|
Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab
Add recent protocol tab to load protocal from repository [SCI-4509]
|
2020-05-08 13:17:26 +02:00 |
|
aignatov-bio
|
d2a479c2e8
|
Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]
|
2020-05-08 12:39:28 +02:00 |
|
aignatov-bio
|
2728df5bac
|
Move helper method to my_module_helper
|
2020-05-08 11:56:29 +02:00 |
|
aignatov-bio
|
c9545ddb19
|
Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab
|
2020-05-08 10:28:33 +02:00 |
|
aignatov-bio
|
dad5ac7a27
|
Fix snapshot button place
|
2020-05-07 19:36:30 +02:00 |
|
Mojca Lorber
|
b3bce933e5
|
Task details description corrections and some changes of locales
|
2020-05-07 16:11:22 +02:00 |
|
aignatov-bio
|
fe658a9b23
|
Merge pull request #2534 from aignatov-bio/ai-sci-4594-refactor-css-for-full-view-repository-view
Update CSS for full view assigned rows modal [SCI-4594]
|
2020-05-07 15:22:06 +02:00 |
|
aignatov-bio
|
8ec7a4b7b4
|
Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
|
2020-05-07 13:03:00 +02:00 |
|
aignatov-bio
|
912b01d34b
|
Merge pull request #2539 from aignatov-bio/ai-sci-4573-small-css-fixes-for-protocols
Fix css for comments and fix modal title size [SCI-4573]
|
2020-05-07 12:59:56 +02:00 |
|
aignatov-bio
|
8076d8f464
|
Create helper for partial
|
2020-05-07 12:51:18 +02:00 |
|
aignatov-bio
|
8b5872347a
|
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown
Add new protocol template dropdown [SCI-4538]
|
2020-05-07 08:32:54 +02:00 |
|
Urban Rotnik
|
a38b850601
|
Merge pull request #2520 from urbanrotnik/ur-sci-4522-activity-links
Activities links [SCI-4522] & [SCI-4514]
|
2020-05-06 22:11:58 +02:00 |
|
aignatov-bio
|
5972c3fdf6
|
Fix css for comments and fix modal title size
|
2020-05-06 13:54:39 +02:00 |
|
aignatov-bio
|
4e5ebd01b5
|
Fix I18n
|
2020-05-06 12:20:20 +02:00 |
|
Urban Rotnik
|
4c4d0a2403
|
Hide icon if there is no users
|
2020-05-06 09:47:39 +02:00 |
|
aignatov-bio
|
a29db548f8
|
Update CSS for full view assigned rows modal
|
2020-05-05 18:17:14 +02:00 |
|
Alex Kriuchykhin
|
7e9054e6d2
|
Merge pull request #2519 from aignatov-bio/ai-sci-4523-add-assign-items-to-task
Add assign items modal and update modal for task inventories [SCI-4523][SCI-4524]
|
2020-05-05 13:20:01 +02:00 |
|
aignatov-bio
|
c556fd2478
|
Merge pull request #2530 from aignatov-bio/ai-sci-4574-fix-css-for-results-page
Fix CSS for results [SCI-4574]
|
2020-05-05 12:58:35 +02:00 |
|
aignatov-bio
|
cf2508c5d0
|
Merge pull request #2522 from aignatov-bio/ai-sci-4508-small-protocol-layout-fixes
Small layout changes for protocol [SCI-4508]
|
2020-05-05 12:57:40 +02:00 |
|
aignatov-bio
|
1b57040c37
|
Fix deepscan issues
|
2020-05-05 09:44:38 +02:00 |
|
aignatov-bio
|
8c57ed3109
|
Fix css for results
|
2020-05-02 22:37:02 +02:00 |
|
aignatov-bio
|
1ed62c4a49
|
Fix I18n and save to repository button
|
2020-05-01 20:45:09 +02:00 |
|
Urban Rotnik
|
760c2fba8f
|
Merge pull request #2523 from urbanrotnik/ur-sci-4549-sidebar-fix
Fix icon position and hover effect in repositories sidebar [SCI-4549]
|
2020-04-30 09:32:20 +02:00 |
|
aignatov-bio
|
19d30e2019
|
Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task
|
2020-04-29 15:13:38 +02:00 |
|
Alex Kriuchykhin
|
0e865f8e45
|
Merge pull request #2525 from okriuchykhin/ok_SCI_4552
Implement background processing of repository snapshots [SCI-4552]
|
2020-04-29 12:03:23 +02:00 |
|
aignatov-bio
|
046c9662d1
|
Fix markup
|
2020-04-28 19:16:04 +02:00 |
|
aignatov-bio
|
61bbca6bcf
|
Fix path names and markup
|
2020-04-28 19:12:17 +02:00 |
|
Urban Rotnik
|
5c72200801
|
Remove tooltips settings for user
|
2020-04-28 12:44:47 +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 |
|
Oleksii Kriuchykhin
|
e6ad5047e0
|
Implement background processing of repository snapshots [SCI-4552]
|
2020-04-28 12:09:36 +02:00 |
|
aignatov-bio
|
0a87bd3dcf
|
Fix markup
|
2020-04-24 15:48:40 +02:00 |
|
aignatov-bio
|
ad705a740c
|
Add new protocol template dropdown
|
2020-04-24 15:48:40 +02:00 |
|
aignatov-bio
|
0604815c00
|
Add assigned task dropdown to repository
|
2020-04-24 15:43:10 +02:00 |
|
Mojca Lorber
|
008ab8ab86
|
Remove redundant data-hook from protocol options dropdown
|
2020-04-24 15:10:42 +02:00 |
|
Urban Rotnik
|
73e5168db6
|
Fix icon position and hover efect in repositories sidebar
|
2020-04-24 14:51:32 +02:00 |
|
aignatov-bio
|
4f941610b2
|
Small layout changes for protocol
|
2020-04-24 11:50:03 +02:00 |
|
mlorb
|
1cea6116b5
|
Merge pull request #2515 from mlorb/ml-sci-4493
Add protocol options dropdown [SCI-4493]
|
2020-04-23 17:21:26 +02:00 |
|
aignatov-bio
|
f65b50c6ff
|
Fix rebase conflicts
|
2020-04-23 16:36:22 +02:00 |
|
Urban Rotnik
|
de4e4ca967
|
Add before_action for team switch
|
2020-04-23 16:20:01 +02:00 |
|
aignatov-bio
|
c2e456aa27
|
Fix activities and specs
|
2020-04-23 15:25:28 +02:00 |
|
aignatov-bio
|
5b375168c0
|
Add I18n
|
2020-04-23 15:24:40 +02:00 |
|
aignatov-bio
|
34d6e903a4
|
Add assign items modal and update modal for task inventories
|
2020-04-23 15:24:40 +02:00 |
|
aignatov-bio
|
10fdd0c1c7
|
Merge branch 'develop' into features/new-task-layout
|
2020-04-23 14:07:40 +02:00 |
|
Alex Kriuchykhin
|
1802d7cb59
|
Merge pull request #2516 from okriuchykhin/ok_SCI_4525
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
|
2020-04-23 13:18:23 +02:00 |
|
Oleksii Kriuchykhin
|
06b6907d13
|
Handle situation when task creator or modifier is not present [SCI-4503]
|
2020-04-23 12:40:27 +02:00 |
|
Oleksii Kriuchykhin
|
608ee23ec4
|
Add task details popover [SCI-4503]
|
2020-04-21 15:11:57 +02:00 |
|
Oleksii Kriuchykhin
|
f811d11c59
|
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
|
2020-04-21 14:49:36 +02:00 |
|
Mojca Lorber
|
6fecee8c0c
|
Add protocol options dropdown
|
2020-04-21 10:03:53 +02:00 |
|
aignatov-bio
|
be47efce74
|
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list
Add repositories dropdown list [SCI-4506]
|
2020-04-16 14:17:17 +02:00 |
|
mlorb
|
9584b11d45
|
Merge pull request #2507 from mlorb/ml-sci-4505
Add the user management section of to the Details section of task layout [SCI-4505]
|
2020-04-16 13:47:31 +02:00 |
|
Alex Kriuchykhin
|
436f0bf63d
|
Merge pull request #2506 from okriuchykhin/ok_SCI_4516
Add repository snapshots with service, refactor item assigning [SCI-4516]
|
2020-04-15 17:32:25 +02:00 |
|
Mojca Lorber
|
e9959747d6
|
small refactor
|
2020-04-14 17:25:36 +02:00 |
|
aignatov-bio
|
338f3a0192
|
Fix css
|
2020-04-14 13:08:07 +02:00 |
|
aignatov-bio
|
15b291347b
|
Fix I18n
|
2020-04-14 12:10:17 +02:00 |
|
aignatov-bio
|
c1cac01b28
|
Add repositories dropdown list
|
2020-04-14 12:10:16 +02:00 |
|
aignatov-bio
|
fe718349da
|
Add recent protocol tab to load protocal from repository
|
2020-04-09 17:29:39 +02:00 |
|
Oleksii Kriuchykhin
|
3a67c99982
|
Switch to STI for repositories, fix cell values snapshotting [SCI-4516]
|
2020-04-09 12:33:04 +02:00 |
|
Mojca Lorber
|
f22f076e6c
|
Add the user management secion of to the Details section of task layout
|
2020-04-08 16:24:59 +02:00 |
|
aignatov-bio
|
e4b65aaf6f
|
Finish full view repository
|
2020-04-08 15:13:21 +02:00 |
|
aignatov-bio
|
087f71a82f
|
Add full view for my-module repository
|
2020-04-07 21:02:16 +02:00 |
|
aignatov-bio
|
845e8c3d6d
|
Fix loading process
|
2020-04-07 12:36:01 +02:00 |
|
aignatov-bio
|
7fdc169ba2
|
Add simple view to repository table
|
2020-04-06 19:52:41 +02:00 |
|
Alex Kriuchykhin
|
80bf5123ec
|
Merge pull request #2497 from aignatov-bio/ai-sci-4472-change-due-date-wording-on-dashboard
Change i18n for due date on current task widget [SCI-4472]
|
2020-04-06 10:27:21 +02:00 |
|
Alex Kriuchykhin
|
967c072dbd
|
Merge pull request #2500 from aignatov-bio/ai-sci-4517-fix-sidebar-when-caching
Fix caching issue for sidebar [SCI-4517]
|
2020-04-06 10:21:59 +02:00 |
|
aignatov-bio
|
fc810b5524
|
Merge pull request #2503 from aignatov-bio/ai-sci-4507-add-assigned-repositories-list
Add assigned repositories list [SCI-4507]
|
2020-04-03 13:59:26 +02:00 |
|
aignatov-bio
|
9a64ebdfd0
|
Update sql and add accordion effect
|
2020-04-03 13:15:56 +02:00 |
|
aignatov-bio
|
dd3f2cb219
|
Update my_module assigned repository method
|
2020-04-03 12:33:42 +02:00 |
|
aignatov-bio
|
f313b6ff01
|
Merge pull request #2492 from aignatov-bio/ai-sci-4339-refactor-login-screen
Update css for login screen [SCI-4339]
|
2020-04-02 15:47:17 +02:00 |
|
aignatov-bio
|
9678372dd5
|
Add assigned repositories list
|
2020-04-02 12:05:07 +02:00 |
|
Mojca Lorber
|
cb554e815a
|
Add new task layout details section
|
2020-04-01 13:05:35 +02:00 |
|
aignatov-bio
|
5705bd8497
|
Fix caching issue for sidebar
|
2020-03-31 22:12:38 +02:00 |
|
Oleksii Kriuchykhin
|
15a793a343
|
Fix start date interpolation in reports [SCI-4504]
|
2020-03-31 18:44:43 +02:00 |
|
Oleksii Kriuchykhin
|
3c53be1f9a
|
Add start date to the task [SCI-4504]
|
2020-03-31 14:17:14 +02:00 |
|
Mojca Lorber
|
bd177f4f2f
|
Renaming fixes
|
2020-03-31 11:22:53 +02:00 |
|
aignatov-bio
|
230099ac82
|
Change i18n for due date on current task widget
|
2020-03-30 15:30:52 +02:00 |
|
mlorb
|
ea6eb0cace
|
Merge branch 'features/new-task-layout' into ml-sci-4483-sci-4486
|
2020-03-30 14:27:35 +02:00 |
|
aignatov-bio
|
10bd1d425d
|
Fix placeholder for tinymce description fields
|
2020-03-30 13:22:34 +02:00 |
|
Mojca Lorber
|
7006036626
|
Add new task general layout and add notes section
|
2020-03-30 12:51:35 +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 |
|
Alex Kriuchykhin
|
4fe3d9f3a7
|
Merge pull request #2414 from aignatov-bio/ai-sci-4134-auto-open-tiny-mce-if-unsaved-data
Open unsaved TinyMce editor [SCI-4134]
|
2020-03-30 09:50:32 +02:00 |
|
aignatov-bio
|
b9e81f208d
|
Fix i18n
|
2020-03-27 10:34:06 +01:00 |
|
aignatov-bio
|
8ff4b540e2
|
Update css for login screen
|
2020-03-27 09:43:49 +01:00 |
|
aignatov-bio
|
a7e4083ef1
|
Fix team dropdown
|
2020-03-25 12:31:47 +01:00 |
|
Miha Mencin
|
be8e18110d
|
Merge pull request #2481 from mlorb/ml-sci-4344
Fix tooltips appear wrongly [SCI-4344]
|
2020-03-24 19:43:34 +01:00 |
|
Alex Kriuchykhin
|
08b53e7735
|
Merge pull request #2484 from biosistemika/ai-sci-4424-teams-dropdown-appears-everytime
Teams dropdown appears every time [SCI-4424]
|
2020-03-24 19:19:15 +01:00 |
|
aignatov-bio
|
d62ec81472
|
Merge pull request #2478 from aignatov-bio/ai-sci-4449-fix-new-protocol-report-dashboard
Fix protocol and report create modals after dashboard redirect [SCI-4449]
|
2020-03-24 16:38:08 +01:00 |
|
Oleksii Kriuchykhin
|
f9a7d58157
|
Fix due dates on task cards in the canvas [SCI-4487]
|
2020-03-24 10:30:29 +01:00 |
|
Mojca Lorber
|
3a58bd3cd6
|
Disable selecting range at update column
|
2020-03-23 20:02:57 +01:00 |
|
aignatov-bio
|
5004270c22
|
Teams dropdown apears everytime
|
2020-03-23 19:42:36 +01:00 |
|
Oleksii Kriuchykhin
|
4db810c18f
|
Fix taken space display for teams [SCI-4479]
|
2020-03-23 16:32:05 +01:00 |
|
Mojca Lorber
|
9045d1a8de
|
Fix tooltips appear wrongly
|
2020-03-22 17:47:13 +01:00 |
|
aignatov-bio
|
da4b55ceea
|
Fix protocol and report create modals after dashboard redirect
|
2020-03-19 19:43:20 +01:00 |
|
aignatov-bio
|
b188b0511b
|
Refactor TinyMCE autosave check
|
2020-03-19 15:45:14 +01:00 |
|
Mojca Lorber
|
94d5dcf4a9
|
Add data hook
|
2020-03-18 10:50:09 +01:00 |
|
mlorb
|
6f0e2fc541
|
Merge pull request #2474 from mlorb/ml-sci-4450-v2
Change default date in preferences [SCI-4450]
|
2020-03-17 16:17:21 +01:00 |
|
mlorb
|
54f7499988
|
Merge pull request #2473 from mlorb/ml-sci-4452
Small support dropdown fixes [SCI-4452]
|
2020-03-17 16:17:06 +01:00 |
|
aignatov-bio
|
e550d49012
|
Merge pull request #2472 from biosistemika/ai-sci-add-class-to-no-inventories-placeholder
Add class to no-inventories placeholder
|
2020-03-17 16:12:55 +01:00 |
|
Mojca Lorber
|
ea755eaea7
|
Change default date in preferences
|
2020-03-17 15:52:57 +01:00 |
|
Mojca Lorber
|
7e36a4e357
|
Small support dropdown fixes
|
2020-03-17 15:44:57 +01:00 |
|
aignatov-bio
|
c39c3e852c
|
Add class to no-inventories placeholder
|
2020-03-17 14:38:11 +01:00 |
|
Alex Kriuchykhin
|
2a2e479cd3
|
Merge pull request #2470 from okriuchykhin/ok_SCI_4408
Enable time fraction for task due date [SCI-4408]
|
2020-03-16 18:55:10 +01:00 |
|
Oleksii Kriuchykhin
|
a518bfe023
|
Enable time fraction for task due date [SCI-4408]
|
2020-03-16 17:55:35 +01:00 |
|
Alex Kriuchykhin
|
35755ab152
|
Merge pull request #2467 from aignatov-bio/ai-sci-4436-change-placeholders-for-dashboards
Change placeholders for dashboard [SCI-4436]
|
2020-03-16 15:22:54 +01:00 |
|
Mojca Lorber
|
24c345721c
|
Add hook
|
2020-03-13 15:04:56 +01:00 |
|
aignatov-bio
|
8164b0d0c6
|
Change placeholders for dashboards
|
2020-03-12 15:00:14 +01:00 |
|
aignatov-bio
|
d924faaafd
|
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
|
2020-03-12 11:26:23 +01:00 |
|
aignatov-bio
|
c13721f842
|
Fix recent work service and move templates to html
|
2020-03-11 11:34:59 +01:00 |
|
Miha Mencin
|
26b687f2e6
|
Merge pull request #2460 from biosistemika/features/dashboard
Features/dashboard
|
2020-03-10 18:06:23 +01:00 |
|
mlorb
|
bea7a6172b
|
Merge pull request #2456 from mlorb/ml-sci-4412
Remove academy link from navigation and move about modal to support menu [SCI-4412]
|
2020-03-10 17:08:22 +01:00 |
|
aignatov-bio
|
63a5459d21
|
Add error handling to create task modal
|
2020-03-10 13:16:56 +01:00 |
|
Miha Mencin
|
9836a8b5a2
|
Merge pull request #2434 from aignatov-bio/ai-sci-4352-inventory-item-is-not-saved-in-case-of-empty-dropdown
Prevent create empty dropdown in inventories [SCI-4352]
|
2020-03-10 12:35:00 +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
|
e729aa043e
|
Add recent work widget
|
2020-03-06 13:51:18 +01:00 |
|
Mojca Lorber
|
8325ed80f0
|
Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard
|
2020-03-04 23:26:01 +01:00 |
|
aignatov-bio
|
e46e496702
|
Add user check to invite user modal
|
2020-03-03 10:30:04 +01:00 |
|
aignatov-bio
|
d9bfd8c28e
|
Add search to current task widget
|
2020-03-03 09:50:44 +01:00 |
|
Oleksii Kriuchykhin
|
73623da02c
|
Merge branch 'develop' into features/dashboard
|
2020-02-28 16:46:56 +01:00 |
|
Alex Kriuchykhin
|
f9ad438fb5
|
Merge pull request #2431 from okriuchykhin/ok_SCI_4381
Add invite users to the team permission check [SCI-4381]
|
2020-02-28 16:40:57 +01:00 |
|
aignatov-bio
|
95fca105eb
|
Add quickstart layout and create task modal
|
2020-02-28 14:34:34 +01:00 |
|
aignatov-bio
|
6dcb8be849
|
Merge branch 'develop' into ai-sci-4380-saving-navigation-state
|
2020-02-28 14:14:08 +01:00 |
|
aignatov-bio
|
8b273acaca
|
Update all sidebars
|
2020-02-28 14:03:08 +01:00 |
|
Miha Mencin
|
1fd876bb40
|
Merge pull request #2425 from mlorb/ml-sci-4348
Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]
|
2020-02-28 12:11:31 +01:00 |
|
aignatov-bio
|
9e15d1ea42
|
Refactor experiment sidebar
|
2020-02-27 16:04:44 +01:00 |
|
aignatov-bio
|
b2580c1704
|
Prevent create empty dropdown in inventories
|
2020-02-27 13:10:00 +01:00 |
|
aignatov-bio
|
630412c18a
|
Change button style for new inventory
|
2020-02-27 12:11:38 +01:00 |
|
Alex Kriuchykhin
|
6841cdd6a6
|
Merge pull request #2415 from aignatov-bio/ai-sci-4365-new-description-to-import-items
New description to import items modal window [SCI-4365]
|
2020-02-26 17:34:57 +01:00 |
|
Oleksii Kriuchykhin
|
62c19f7c02
|
Add invite users to the team permission check [SCI-4381]
|
2020-02-26 17:25:38 +01:00 |
|
Mojca Lorber
|
f29ce66bea
|
Refactor backend, add empty state and fix some small scc changes
|
2020-02-26 11:07:17 +01:00 |
|
aignatov-bio
|
8e05908753
|
Small fixes
|
2020-02-25 17:19:11 +01:00 |
|
Mojca Lorber
|
9bd2e8bec4
|
Dashboard current tasks visual layout and backend
|
2020-02-21 10:41:42 +01:00 |
|
aignatov-bio
|
cf4dbd5ff4
|
Add calendar widget
|
2020-02-20 17:02:38 +01:00 |
|
aignatov-bio
|
01868fff23
|
Add calendar front-end
|
2020-02-19 15:57:06 +01:00 |
|
aignatov-bio
|
f11b051715
|
Merge branch 'develop' into features/dashboard
|
2020-02-19 10:29:50 +01:00 |
|
aignatov-bio
|
bbd48c9e08
|
Add border to add column button
|
2020-02-18 14:40:16 +01:00 |
|
aignatov-bio
|
5886f2cf90
|
New description to import items modal window
|
2020-02-18 12:13:52 +01:00 |
|
aignatov-bio
|
0117b577f4
|
Fix typo
|
2020-02-18 09:27:07 +01:00 |
|
aignatov-bio
|
ff45b17b53
|
Fix localization and small markup fixes
|
2020-02-17 15:32:43 +01:00 |
|
aignatov-bio
|
a438f6b4f0
|
Finished filters
|
2020-02-17 10:47:10 +01:00 |
|
aignatov-bio
|
485597a9ef
|
Add front-end part
|
2020-02-14 12:07:40 +01:00 |
|
mlorb
|
618aa698d5
|
Merge pull request #2407 from mlorb/ml-sci-4329
Fix adding too small/big number to input... [SCI-4329]
|
2020-02-14 10:40:20 +01:00 |
|
aignatov-bio
|
95c9479f54
|
Add page title
|
2020-02-13 14:54:58 +01:00 |
|
aignatov-bio
|
8e8f21969a
|
Fix markup
|
2020-02-13 13:55:25 +01:00 |
|
aignatov-bio
|
5c0a769f87
|
General dashboard layout
|
2020-02-13 13:50:29 +01:00 |
|
aignatov-bio
|
bdf4394d5f
|
Clean notifications partial from layouts
|
2020-02-13 09:52:45 +01:00 |
|
Mojca Lorber
|
0f67ce78c0
|
Fix adding too small/big number to input for decimals for number repo column type
|
2020-02-12 12:14:58 +01:00 |
|
mlorb
|
8a9d495b77
|
Merge pull request #2398 from mlorb/ml-sci-4147
Change repository name and team name to h2 [SCI-4147]
|
2020-02-11 16:27:03 +01:00 |
|
aignatov-bio
|
26783e64da
|
Fix protocols table CSS
|
2020-02-11 15:58:17 +01:00 |
|
Mojca Lorber
|
509e197f64
|
Change repository name and team name to h2
|
2020-02-11 13:18:33 +01:00 |
|
Alex Kriuchykhin
|
446280a2e4
|
Merge pull request #2391 from okriuchykhin/ok_SCI_4330
Improve speed of global activities fetching query [SCI-4330]
|
2020-02-10 10:44:52 +01:00 |
|
Oleksii Kriuchykhin
|
5470bb9b9b
|
Fix file result only name update [SCI-4321]
|
2020-02-07 15:21:50 +01:00 |
|
Oleksii Kriuchykhin
|
6f8f89fbf0
|
Improve speed of global activities fetching query [SCI-4330]
|
2020-02-07 13:53:25 +01:00 |
|
mlorb
|
f26ea42cc5
|
Merge pull request #2390 from mlorb/ml-sci-4265-v2
Redesign clear buttons on global activities page [SCI-4265]
|
2020-02-07 13:49:00 +01:00 |
|
Mojca Lorber
|
9068c20588
|
Redesign clear buttons on global activities page
|
2020-02-07 11:33:25 +01:00 |
|
Mojca Lorber
|
ef241150f6
|
Fix edit tag on task page
|
2020-02-06 12:57:03 +01:00 |
|
Mojca Lorber
|
2727614603
|
Clean up controllers for manage repository columns
|
2020-02-04 16:05:16 +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
|
415abf8968
|
Merge pull request #2382 from mlorb/ml-sci-4283
Implement missing style guide changes [SCI-4283]
|
2020-02-04 09:37:48 +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
|
cd14fe01f7
|
Rename div
|
2020-02-02 18:52:40 +01:00 |
|
Mojca Lorber
|
e70bc67146
|
Implement missing style guide changes
|
2020-01-31 14:11:37 +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 |
|
mlorb
|
bfd928b8fc
|
Merge pull request #2373 from mlorb/ml-sci-4293
Fix buttons style [SCI-4293]
|
2020-01-30 13:40:37 +01:00 |
|
Urban Rotnik
|
64a7657f19
|
Merge pull request #2364 from urbanrotnik/ur-sci-4219
Fix too long line problem[SCI-4219]
|
2020-01-30 13:07:01 +01:00 |
|
Urban Rotnik
|
d069173ad7
|
Merge pull request #2371 from urbanrotnik/ur-sci-4178
Fix attachments sorting [SCI-4178]
|
2020-01-30 11:29:45 +01:00 |
|
Urban Rotnik
|
15f0d41b14
|
Fix delimiter dropdown selection
|
2020-01-30 09:26:00 +01:00 |
|
aignatov-bio
|
2c595d01fc
|
Merge pull request #2370 from biosistemika/ai-sci-add-container-for-repository-filters
Small fixes
|
2020-01-29 15:48:19 +01:00 |
|
Urban Rotnik
|
875515121b
|
Fix Share button in repositories
|
2020-01-29 14:15:47 +01:00 |
|
Urban Rotnik
|
765a577669
|
Ellipsis with css for Sidebar
|
2020-01-29 13:22:35 +01:00 |
|
Mojca Lorber
|
f502408e07
|
Fix buttons style
|
2020-01-28 15:30:57 +01:00 |
|
Urban Rotnik
|
d974ff57e1
|
Fix attachments sorting
|
2020-01-28 15:01:20 +01:00 |
|
aignatov-bio
|
0ce52aae94
|
Add container for repository filters
|
2020-01-28 14:11:11 +01:00 |
|
Urban Rotnik
|
6c50b514f3
|
Put Academy icon back, resize team switch
|
2020-01-27 17:15:22 +01:00 |
|
Urban Rotnik
|
83f4344bb7
|
Merge pull request #2366 from urbanrotnik/ur-sci-4298-hide-buttons-on-column-manage
Hide Edit/Delete buttons if user do not has permissions
|
2020-01-27 16:35:07 +01:00 |
|
Urban Rotnik
|
71a8a8655f
|
Remove Academy icon
|
2020-01-27 14:52:19 +01:00 |
|
Urban Rotnik
|
d7761622ba
|
Hide Edit/Delete buttons if user do not has permissions
|
2020-01-25 12:36:36 +01:00 |
|
Mojca Lorber
|
3af2f4af19
|
Change to new style checkboxes on share inventory modal
|
2020-01-24 15:43:13 +01:00 |
|
Mojca Lorber
|
f5d245e7cc
|
Sidebar redesign
|
2020-01-24 13:22:04 +01:00 |
|
aignatov-bio
|
79d71f1e9b
|
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker
Add new emoji picker [SCI-4268]
|
2020-01-21 16:33:05 +01:00 |
|
Mojca Lorber
|
981f8678df
|
Fix alerts style
|
2020-01-21 15:21:40 +01:00 |
|
Urban Rotnik
|
1ecea5216e
|
Add webpack libs for emojis and assets
|
2020-01-21 11:43:04 +01:00 |
|
aignatov-bio
|
6a67280f6a
|
Add new emoji picker
|
2020-01-21 10:50:55 +01:00 |
|
Miha Mencin
|
96ed19ab22
|
Merge pull request #2342 from aignatov-bio/ai-sci-4269-fix-small-scss-issue-with-new-branding
Fix small css issues [SCI-4269]
|
2020-01-21 09:22:56 +01:00 |
|
aignatov-bio
|
e022f7a096
|
Fix small css issues
|
2020-01-20 15:48:51 +01:00 |
|
aignatov-bio
|
01cce84314
|
Merge pull request #2339 from aignatov-bio/ai-sci-4195-update-delimiter-dropdown
Update delimiter dropdown for manage column modal [SCI-4195]
|
2020-01-20 15:22:40 +01:00 |
|
mlorb
|
9747a72567
|
Merge pull request #2338 from mlorb/ml-sci-4132-v2
Change html structure for flash msg, change columns buttons [SCI-4132]
|
2020-01-20 14:36:33 +01:00 |
|
aignatov-bio
|
cd471bfb25
|
Update delimiter dropdown for manage column modal
|
2020-01-20 14:26:17 +01:00 |
|
Mojca Lorber
|
772118d246
|
change html structure for flash msg, change columns buttons
|
2020-01-20 14:02:42 +01:00 |
|
Urban Rotnik
|
fc29641c2b
|
Hide manage column action buttons on Task page
|
2020-01-17 17:29:26 +01:00 |
|
Miha Mencin
|
61ead41271
|
Merge pull request #2332 from urbanrotnik/ur-sci-4193-item-error-handling
item error handling [SCI-4193] FIX
|
2020-01-17 14:07:19 +01:00 |
|
Urban Rotnik
|
58ed1d3f8a
|
Update default delimiter for new records
|
2020-01-17 12:14:50 +01:00 |
|
Alex Kriuchykhin
|
4a96fa2648
|
Merge pull request #2323 from aignatov-bio/ai-sci-4255-disable-column-manage-button-in-edit-mode
Disable column manage button in edit mode [SCI-4255]
|
2020-01-16 16:37:29 +01:00 |
|
aignatov-bio
|
b7fe8b71c1
|
Disable column manage button in edit mode
|
2020-01-16 15:59:57 +01:00 |
|
Mojca Lorber
|
a342e3d31f
|
Add emojionearea for status column type
|
2020-01-16 14:58:59 +01:00 |
|
Urban Rotnik
|
0522b9b0a3
|
Update too many items error showing
Update too many items error showing
|
2020-01-16 11:40:59 +01:00 |
|
aignatov-bio
|
1ff0351a74
|
Merge branch 'develop' into ai-sci-4328-fix-general-css-issues-for-repositories
|
2020-01-16 11:36:00 +01:00 |
|
Oleksii Kriuchykhin
|
168ba9d1c6
|
Fix logo and flash messages in sign_in_halt layout [SCI-4243]
|
2020-01-15 18:04:07 +01:00 |
|
aignatov-bio
|
b116c3720c
|
Fix general css issue for repositories
|
2020-01-15 16:46:01 +01:00 |
|
Miha Mencin
|
b23c874f9e
|
Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost
Sci 4199 selected checklist is lost
|
2020-01-15 15:28:34 +01:00 |
|
mlorb
|
e44903bae5
|
Merge branch 'develop' into ml-sci-4150-v2
|
2020-01-15 14:47:25 +01:00 |
|
Miha Mencin
|
7134eb2bc4
|
fixing spacing
|
2020-01-15 14:03:42 +01:00 |
|
Miha Mencin
|
8c77058179
|
fixing indentation
|
2020-01-15 14:02:33 +01:00 |
|
Miha Mencin
|
5bfa5c7939
|
SCI-4199 disabling delimiter, adding warning
|
2020-01-15 13:59:28 +01:00 |
|
Alex Kriuchykhin
|
da26d8a018
|
Merge pull request #2304 from okriuchykhin/ok_SCI_4204
Refactor repository cell cloning to support all data types [SCI-4204]
|
2020-01-15 13:04:50 +01:00 |
|
Urban Rotnik
|
6d55b07fdc
|
Merge branch 'develop' into ai-sci-4128-change-datatable-headers-colors
|
2020-01-15 09:10:43 +01:00 |
|
Urban Rotnik
|
2c86c2263d
|
Merge pull request #2298 from urbanrotnik/ur-sci-4230-cannot-create-checklist
Fix empty checklist and dropdown column creation [SCI-4230]
|
2020-01-15 09:09:17 +01:00 |
|
Oleksii Kriuchykhin
|
eed68a2590
|
Refactor repository cell clonning to support all data types [SCI-4204]
|
2020-01-14 16:55:10 +01:00 |
|
Mojca Lorber
|
16226640d5
|
changes upon Antons review
|
2020-01-14 16:46:48 +01:00 |
|
aignatov-bio
|
79b020b97e
|
Update table header color and update checkboxes
|
2020-01-14 11:39:15 +01:00 |
|
Mojca Lorber
|
9176301b7b
|
Refactor manage repository columns, move it from page into modal
|
2020-01-14 11:13:19 +01:00 |
|
Alex Kriuchykhin
|
4ca2981177
|
Merge pull request #2299 from okriuchykhin/ok_SCI_4224
Fix repository filtering and improve speed [SCI-4224]
|
2020-01-13 17:57:11 +01:00 |
|
Oleksii Kriuchykhin
|
01b8d2226d
|
Optimize repository table counters [SCI-4224]
|
2020-01-13 16:31:42 +01:00 |
|
Oleksii Kriuchykhin
|
7b82e33eb6
|
Fix repository filtering and improve speed [SCI-4224]
|
2020-01-13 16:09:07 +01:00 |
|
Urban Rotnik
|
0a3359e815
|
Fix empty checklist and dropdown column creation
|
2020-01-13 15:48:55 +01:00 |
|
aignatov-bio
|
b37d8f1275
|
Update layout for repository
|
2020-01-13 14:46:43 +01:00 |
|
aignatov-bio
|
189bf5762e
|
Fix const in repository show view
|
2020-01-13 10:13:33 +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 |
|
aignatov-bio
|
f494a97f99
|
Merge pull request #2290 from aignatov-bio/ai-sci-4200-fix-error-on-opening-inventory
Fix error on opening inventory [SCI-4200]
|
2020-01-09 16:00:12 +01:00 |
|
aignatov-bio
|
8a647ee003
|
Fix error on opening inventory
|
2020-01-09 15:32:28 +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
|
54c78cf4d1
|
Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles
Update colors and buttons
|
2020-01-08 12:30:51 +01:00 |
|
aignatov-bio
|
5953c2543d
|
Fix typo and boostrap load order
|
2020-01-08 12:07:33 +01:00 |
|
aignatov-bio
|
68646276f5
|
Replace bootstrap styles for button
|
2020-01-07 16:13:34 +01:00 |
|
Oleksii Kriuchykhin
|
d9b9243da7
|
Merge branch 'develop' into features/new-column-types
|
2020-01-07 16:03:33 +01:00 |
|
Oleksii Kriuchykhin
|
16b591b110
|
Fix sidebar update for inline editing [SCI-4000]
|
2020-01-06 16:07:23 +01:00 |
|
aignatov-bio
|
464d03558a
|
Fix markup, replace buttons and add new logo
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
18a8be43f5
|
Add new logo
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
d93095b489
|
Fix markup
|
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
|
3f38b1e6a1
|
Add text input fields
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
443ab8645f
|
Add toggles
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
7bfefd8659
|
Add checkboxes and radio buttons
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
9694117635
|
Add new colors and buttons
|
2020-01-06 10:40:20 +01:00 |
|
Urban Rotnik
|
87288d0771
|
Add search for statuses
|
2020-01-06 10:12:08 +01:00 |
|
Urban Rotnik
|
400c109592
|
Refactor StatusesJS for new dropdown
|
2019-12-23 14:34:11 +01:00 |
|
Urban Rotnik
|
f3bc6386c3
|
Fix partials renderer
|
2019-12-20 14:59:26 +01:00 |
|
Urban Rotnik
|
2a63854123
|
Edit and new renderers for DateTime columns
|
2019-12-20 14:55:11 +01:00 |
|
Urban Rotnik
|
7c71159303
|
Add Inputmask to webpack
|
2019-12-20 14:50:44 +01:00 |
|
Alex Kriuchykhin
|
0566b17d50
|
Merge pull request #2272 from okriuchykhin/ok_SCI_4166
Add view/edit renderers for numeric data type [SCI-4166]
|
2019-12-19 11:57:13 +01:00 |
|
Oleksii Kriuchykhin
|
e24bc2775a
|
Add view/edit renderers for numeric data type [SCI-4166]
|
2019-12-18 11:55:12 +01:00 |
|
Urban Rotnik
|
7153711570
|
Move delimiter from column to metadata
|
2019-12-18 10:22:52 +01:00 |
|
Alex Kriuchykhin
|
792e6f2eb9
|
Merge pull request #2263 from okriuchykhin/ok_SCI_4142
Implement SSO with Azure AD [SCI-4142]
|
2019-12-12 16:12:40 +01:00 |
|
aignatov-bio
|
7664f4be78
|
Add checklist and list edit mode
|
2019-12-11 14:49:14 +01:00 |
|
Oleksii Kriuchykhin
|
1aa334fdaa
|
Merge branch 'develop' into release-1-17-8
|
2019-12-11 10:55:00 +01:00 |
|
Oleksii Kriuchykhin
|
ff4ef818fb
|
Implement SSO with Azure AD [SCI-4142]
|
2019-12-10 17:24:53 +01:00 |
|
aignatov-bio
|
7fc9c0d1e4
|
Adding frontend for checklist edit mode
|
2019-12-10 15:58:59 +01:00 |
|
Mojca Lorber
|
a3a5b21951
|
small fixes
|
2019-12-10 12:02:08 +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 |
|
Mojca Lorber
|
8503dd7007
|
Add numeric repository column type
|
2019-12-09 16:38:21 +01:00 |
|
aignatov-bio
|
2a38928b7a
|
Merge pull request #2251 from aignatov-bio/ai-sci-4068-custom-select-on-manage-columns-forms
Update drop-down for columns type selection [SCI-4068]
|
2019-12-09 14:09:21 +01:00 |
|
aignatov-bio
|
09079fbcda
|
Fix naming and tests
|
2019-12-09 13:48:36 +01:00 |
|
aignatov-bio
|
d8676596f1
|
Add checklists column type
|
2019-12-09 13:48:36 +01:00 |
|
aignatov-bio
|
eb708e4226
|
Update dropdown for column type selection
|
2019-12-06 16:14:16 +01:00 |
|
aignatov-bio
|
63edd3e877
|
Remove edit initialization from view mode
|
2019-12-06 13:26:47 +01:00 |
|
Urban Rotnik
|
2c0a6ed085
|
Remove current_user vars
|
2019-12-06 11:12:07 +01:00 |
|
Oleksii Kriuchykhin
|
7a89cae56f
|
Fix TinyMCE images and avatars for export all [SCI-4107]
|
2019-12-05 13:27:17 +01:00 |
|
Oleksii Kriuchykhin
|
03667f619f
|
Merge branch 'release-1-17-7' into develop
|
2019-12-05 13:03:39 +01:00 |
|
aignatov-bio
|
010a44650c
|
Fix task activity page
|
2019-12-02 16:04:50 +01:00 |
|
Urban Rotnik
|
3ab1967703
|
Add Edit renderer for Statuses
|
2019-12-02 11:03:05 +01:00 |
|
Urban Rotnik
|
3a76753b72
|
Add Edit renderer for ListColumnType
|
2019-11-29 12:52:27 +01:00 |
|
Alex Kriuchykhin
|
fbf1a5b6e2
|
Merge pull request #2239 from okriuchykhin/ok_SCI_4098
Refactor Azure configuration and connected accounts [SCI-4098]
|
2019-11-29 11:30:33 +01:00 |
|
Urban Rotnik
|
5f2407e3fb
|
Add view renders for DateTime column types
|
2019-11-29 10:50:14 +01:00 |
|
Urban Rotnik
|
cac4c11071
|
Typo fix
|
2019-11-29 10:19:57 +01:00 |
|
Urban Rotnik
|
65d8d0e35b
|
DateTime HTML and JS simplified
|
2019-11-29 10:19:57 +01:00 |
|
Urban Rotnik
|
bc1c377f63
|
Fix html
|
2019-11-29 10:19:56 +01:00 |
|
Urban Rotnik
|
cb0fe049f0
|
Remove range method from model
|
2019-11-29 10:19:55 +01:00 |
|
Urban Rotnik
|
5ae29d549e
|
Add manage modal for DateTime values
|
2019-11-29 10:19:55 +01:00 |
|
Urban Rotnik
|
253205dcd1
|
Syntax improvements
|
2019-11-29 10:19:12 +01:00 |
|
Urban Rotnik
|
85153a5785
|
Split css file
|
2019-11-29 10:19:12 +01:00 |
|
Urban Rotnik
|
9bf948c3a8
|
Add statuses validation on FE
|
2019-11-29 10:19:11 +01:00 |
|
Urban Rotnik
|
b9d50263c4
|
Add simple emoji picker
|
2019-11-29 10:19:11 +01:00 |
|
Urban Rotnik
|
621f7da37b
|
Add fields for StatusItem
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
b2ce600820
|
Add delimiter column for repository_column
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
b2b6296cb5
|
Improve update items action, JS and views
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
db2943a1b7
|
Strip length of dropdown items, unique items, add specific params to request
|
2019-11-29 10:19:09 +01:00 |
|
Urban Rotnik
|
6fbb99c8d2
|
Add List items partial and JS
|
2019-11-29 10:19:09 +01:00 |
|
Urban Rotnik
|
24acf1f84b
|
Fix edit mode for File and Text
|
2019-11-29 10:19:08 +01:00 |
|
Oleksii Kriuchykhin
|
3481b50796
|
Fix column reordering for repositories [SCI-4070]
|
2019-11-29 10:19:06 +01:00 |
|
Oleksii Kriuchykhin
|
338b710d81
|
Refactor inventory edit mode [SCI-4070]
|
2019-11-29 10:19:05 +01:00 |
|
aignatov-bio
|
9eec36cb01
|
Refactor column type edit modal
|
2019-11-29 10:17:58 +01:00 |
|
Mojca Lorber
|
305104f639
|
Refactor text inventory type
|
2019-11-29 10:17:53 +01:00 |
|
Mojca Lorber
|
482deafdd3
|
Rename partial
|
2019-11-29 10:17:49 +01:00 |
|
Mojca Lorber
|
fe8829b592
|
Fix multiple load of modal
|
2019-11-29 10:17:49 +01:00 |
|
Mojca Lorber
|
f1487561be
|
Reafactor javascript repository column
|
2019-11-29 10:17:48 +01:00 |
|
Mojca Lorber
|
9d4796cf90
|
refactor repository column javascript
|
2019-11-29 10:17:44 +01:00 |
|
Mojca Lorber
|
467c80da52
|
Update basic modal layout for creating new column types
|
2019-11-29 10:16:47 +01:00 |
|
Oleksii Kriuchykhin
|
6c7f45fc20
|
Add simplified view for sign-in form [SCI-4098]
|
2019-11-28 17:00:43 +01:00 |
|
aignatov-bio
|
990d8e1c3a
|
Merge pull request #2218 from aignatov-bio/ai-sci-4088-remove-rte-from-team-description
Replace RTE with simple textarea [SCI-4088]
|
2019-11-28 14:45:06 +01:00 |
|
Miha Mencin
|
13191f1a72
|
Merge pull request #2223 from biosistemika/SCI-4058-disable-inventory-delition-for-normal-user
Sci 4058 disable inventory delition for normal user
|
2019-11-28 14:31:32 +01:00 |
|
Oleksii Kriuchykhin
|
f5abb7c767
|
Add connected accounts section to settings [SCI-4106]
|
2019-11-27 23:16:25 +01:00 |
|
aignatov-bio
|
3322676373
|
Replace RTE with simple textarea
|
2019-11-27 12:37:33 +01:00 |
|
aignatov-bio
|
75f29d7b04
|
Fix tag edit mode
|
2019-11-27 12:34:54 +01:00 |
|
Miha Mencin
|
a328c4ad56
|
fix CR comments
|
2019-11-25 17:40:29 +01:00 |
|
aignatov-bio
|
8f2eaaacf9
|
Merge pull request #2229 from aignatov-bio/ai-sci-4111-fix-css-on-activity-page
Update css for global activities page [SCI-4111]
|
2019-11-25 14:08:33 +01:00 |
|
aignatov-bio
|
4a641ac03a
|
Merge pull request #2227 from aignatov-bio/ai-sci-4110-update-due-date-autosave-for-tags
Fix permission check and due date clear [SCI-4110]
|
2019-11-25 13:55:20 +01:00 |
|
aignatov-bio
|
e99fe2dbda
|
Update css for global activties page
|
2019-11-25 11:09:37 +01:00 |
|
aignatov-bio
|
e76b4ca26f
|
Fix permission check and due date clear
|
2019-11-24 21:06:34 +01:00 |
|
aignatov-bio
|
7fa753ca81
|
Fix name update and path to team
|
2019-11-23 23:20:38 +01:00 |
|
aignatov-bio
|
96523ae131
|
Update CSS for team preferences and enable autosave
|
2019-11-22 10:46:44 +01:00 |
|
aignatov-bio
|
c712e4e48c
|
Fix due date moda
|
2019-11-21 13:05:36 +01:00 |
|
aignatov-bio
|
f2ed3198d5
|
Add due date autosave field
|
2019-11-21 12:14:43 +01:00 |
|
Miha Mencin
|
04a6645cfc
|
Separate view/edit/modify permissions SCI-4058
|
2019-11-20 17:12:47 +01:00 |
|
aignatov-bio
|
56ae32323c
|
Add autosave for protocol keywords and user preferences
|
2019-11-20 14:57:53 +01:00 |
|
aignatov-bio
|
264493a322
|
Finish removing Select2 library
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
e7ad7ae969
|
New tags drop down
|
2019-11-18 13:59:55 +01:00 |
|
Anton Ignatov
|
b1c32d9a30
|
Improve dropdown and side panel
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
7117b767f4
|
Fix commnets to PR
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
17e457c686
|
Finished global activities refactoring
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
fc70ce24f8
|
Refactor side filters for global activities
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
7b855f54ac
|
Finish main part of selectors
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
f832cfbbd4
|
Added tags
|
2019-11-18 13:59:54 +01:00 |
|
aignatov-bio
|
b1f9e7f1ca
|
Fix global activities jsonb field [SCI-3830] (#2030)
* Fix global activities jsonb field
* Fix tests
|
2019-11-18 13:59:54 +01:00 |
|
aignatov-bio
|
3eb6f5695b
|
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004
Add auto-save feature to text fields [SCI-4004]
|
2019-11-18 09:11:10 +01:00 |
|
aignatov-bio
|
b9a34fa809
|
Fix placeholder for authors
|
2019-11-15 16:23:48 +01:00 |
|
aignatov-bio
|
19f5f9de67
|
Disable autocomplete for textarea field
|
2019-11-12 14:44:33 +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 |
|
Alex Kriuchykhin
|
ec66ab8654
|
Merge pull request #2190 from mlorb/ml-sci-4023
Small improvements in the avatar settings [SCI-4023]
|
2019-10-30 16:02:24 +01:00 |
|
Mojca Lorber
|
7b86a3932a
|
Additional avatar small fixes
|
2019-10-30 15:23:14 +01:00 |
|
aignatov-bio
|
717b70f75b
|
Merge pull request #2171 from aignatov-bio/ai-sci-3995-fix-avatar-comments-and-activties
Fix avatars in comments and activities [SCI-3995]
|
2019-10-29 14:11:39 +01:00 |
|
Mojca Lorber
|
a0873cb16d
|
Small improvements in the avatar settings
|
2019-10-29 13:21:22 +01:00 |
|
Alex Kriuchykhin
|
5524598d53
|
Merge pull request #2172 from biosistemika/release_1_17_3
Merge release 1.17.3 to master
|
2019-10-22 12:45:02 +02:00 |
|
aignatov-bio
|
9950a23188
|
Replace base64 avatars with url
|
2019-10-22 12:27:13 +02:00 |
|
Oleksii Kriuchykhin
|
53402c9ce1
|
Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
|
2019-10-17 13:30:14 +02:00 |
|
aignatov-bio
|
54627faeb3
|
Fix tests
|
2019-10-11 11:46:51 +02:00 |
|
aignatov-bio
|
521a367960
|
Add predefined avatars
|
2019-10-11 11:46:51 +02:00 |
|
aignatov-bio
|
1f43f35073
|
First modal
|
2019-10-11 11:46:51 +02:00 |
|
mlorb
|
9e1339fb18
|
Merge pull request #2124 from aignatov-bio/ai-sci-3961-fix-image-in-archive-experiments
Fix image in archived experiments [SCI-3961]
|
2019-10-04 14:52:55 +02:00 |
|
aignatov-bio
|
23581059e7
|
Remove image
|
2019-10-04 14:50:27 +02:00 |
|
aignatov-bio
|
c2c8343c57
|
Merge pull request #2111 from aignatov-bio/ai-sci-3943-fix-marvinjs-in-search
Fix MarvinJS representation in global search [SCI-3943]
|
2019-10-04 09:16:34 +02:00 |
|
Urban Rotnik
|
4b626ab2dd
|
Merge pull request #2103 from urbanrotnik/ur-sci-3936-permission-issue
Add permission check for button show [SCI-3936]
|
2019-10-02 09:51:53 +02:00 |
|
aignatov-bio
|
675d5eb088
|
Fix MarvinJS representation in global search
|
2019-10-01 14:20:20 +02:00 |
|
Anton Ignatov
|
33497d11a3
|
Merge branch 'activestorage_migration'
|
2019-10-01 10:36:05 +02:00 |
|
Urban Rotnik
|
5812ebe4d5
|
Add permission check for button show
SCI-3936
|
2019-09-30 14:30:03 +02:00 |
|
Urban Rotnik
|
dfafd4767c
|
Fix Protocol buttons group
[SCI-3929]
|
2019-09-30 11:51:37 +02:00 |
|
Jure Grabnar
|
b3cafcec7c
|
Add restore draft notification to all models
Close SCI-3751
|
2019-09-30 11:34:39 +02:00 |
|
Jure Grabnar
|
6e33baa995
|
Add skeleton restore-draft notification for module description
|
2019-09-30 11:32:38 +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
|
93363da4e5
|
Fix preview for result
|
2019-09-26 16:49:56 +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 |
|
aignatov-bio
|
d783391290
|
Merge pull request #2071 from aignatov-bio/ai-sci-3889-fix-error-on-archived-experiment-page
Fix error on archived experiment page [SCI-3889]
|
2019-09-18 15:35:53 +02:00 |
|
Anton Ignatov
|
5a1efb84c6
|
Fix error on archived experiment page
|
2019-09-18 15:23:45 +02:00 |
|
aignatov-bio
|
c652bb0d44
|
Merge pull request #2066 from aignatov-bio/ai-sci-3878-fix-missing-expand-all-steps-button
Fix missing expand all button [SCI-3878]
|
2019-09-18 14:59:29 +02:00 |
|
Anton Ignatov
|
0adb016293
|
Fix missing expand all button
|
2019-09-18 12:33:48 +02:00 |
|
Anton Ignatov
|
68994a77c8
|
Fix file preview in inventory
|
2019-09-18 11:21:33 +02:00 |
|
Mojca Lorber
|
47ccf38662
|
Redesign of sorting button for projects/experiments cards
|
2019-09-16 14:43:12 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
aignatov-bio
|
c4e8e8ed07
|
Revert "Fix formulas in project export (#2047)" (#2049)
This reverts commit 36ae7d05f9 .
|
2019-09-12 10:45:43 +02:00 |
|
aignatov-bio
|
36ae7d05f9
|
Fix formulas in project export (#2047)
|
2019-09-12 08:43:59 +02:00 |
|
aignatov-bio
|
07b9091e23
|
Fix html escape in unshared warning (#2048)
|
2019-09-11 16:33:31 +02:00 |
|
aignatov-bio
|
40b5b2406b
|
Fix big inventory names (#2046)
|
2019-09-11 15:44:38 +02:00 |
|
aignatov-bio
|
27104a495c
|
Fix styling for unshared warning message (#2044)
|
2019-09-11 11:50:02 +02:00 |
|
mlorb
|
e596afa595
|
Merge pull request #2041 from mlorb/ml-sci-3847
Fix missing icon on shared inventories in global search [SCI-3847]
|
2019-09-10 13:51:58 +02:00 |
|
aignatov-bio
|
1f12a63a25
|
Fix counter on task inventory and failing test (#2043)
|
2019-09-10 13:51:37 +02:00 |
|
Mojca Lorber
|
e8f24b18e2
|
Fix missing icon on shared inventories in global search
|
2019-09-10 11:20:18 +02:00 |
|
Miha Mencin
|
33d495956e
|
Merge pull request #2040 from biosistemika/SCI3818-unshared-inventory-screen
adding missing file
|
2019-09-09 16:47:47 +02:00 |
|
Miha Mencin
|
01628e1efc
|
adding missing file
|
2019-09-09 16:46:51 +02:00 |
|
Alex Kriuchykhin
|
b8a5b1b542
|
Merge pull request #2036 from okriuchykhin/ok_SCI_3815
Improve behavior of inventory items export modal [SCI-3815]
|
2019-09-09 11:08:02 +02:00 |
|
aignatov-bio
|
fdce4e6c7c
|
Remove link to archived project page (#2037)
|
2019-09-09 10:43:08 +02:00 |
|
Oleksii Kriuchykhin
|
265047caf3
|
Improve behaviour of inventory items export modal [SCI-3815]
|
2019-09-09 10:38:47 +02:00 |
|
Miha Mencin
|
7fc5035d2d
|
PR fixes, codestyle fixes
|
2019-09-06 13:47:06 +02:00 |
|
Miha Mencin
|
2486bd0077
|
SCI3818-unshared-inventory-screen
|
2019-09-05 14:03:08 +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 |
|
Oleksii Kriuchykhin
|
267c53c2d2
|
Refactor inventory sharing logic [SCI-3803]
|
2019-08-29 17:21:49 +02:00 |
|
aignatov-bio
|
d209b3abcd
|
Update share modal window [SCI-3812] (#2018)
* Update share modal window
* Fix markup
|
2019-08-29 13:45:27 +02:00 |
|
aignatov-bio
|
d3ccdbd83e
|
Create copy permission (#2017)
|
2019-08-29 13:39:22 +02:00 |
|
aignatov-bio
|
4d20cd7d55
|
Fix copy inventory permission (#2016)
|
2019-08-26 14:48:38 +02:00 |
|
Miha Mencin
|
0058198bb5
|
Merge branch 'master' into SCI-3806-shared-status-dropdown
|
2019-08-26 11:55:25 +02:00 |
|
mlorb
|
ffe06d5070
|
Merge pull request #2010 from mlorb/ml-sci-3805
Add a team name to inventory item card [SCI-3805]
|
2019-08-26 11:29:12 +02:00 |
|
aignatov-bio
|
66326d90e5
|
Fix shared icon show/hidden (#2014)
|
2019-08-26 11:24:22 +02:00 |
|
Miha Mencin
|
b850efbceb
|
Code review remarks, added tooltip for unshared inventory
|
2019-08-26 10:45:40 +02:00 |
|
Miha Mencin
|
9e9e698778
|
SCI-3806 Add an icon indicating shared status to dropdown
|
2019-08-26 09:14:37 +02:00 |
|
Luka Murn
|
c5c47916d2
|
Change localization key to not be called custom_field
|
2019-08-23 16:06:30 +02:00 |
|
Luka Murn
|
a6ca155fa7
|
Rename repository module report element to have new CSS class
|
2019-08-23 16:05:42 +02:00 |
|
aignatov-bio
|
96e132c62e
|
Hide share button for users with one team (#2005)
|
2019-08-23 11:29:03 +02:00 |
|
aignatov-bio
|
5515bac773
|
Add assigned items from shared inventories to report (#2002)
|
2019-08-23 11:28:09 +02:00 |
|
Mojca Lorber
|
50c78f182c
|
Add a team name to inventory item card
|
2019-08-23 11:13:58 +02:00 |
|
aignatov-bio
|
0810699770
|
Update shared inventory permissions [SCI-3802] (#2009)
* Update shared inventory permissions
* Fix tests and simplify condition for placeholder
|
2019-08-23 10:57:02 +02:00 |
|
Luka Murn
|
5d3a0d7eea
|
Merge pull request #2003 from Ducz0r/lm-remove-legacy-projects-views
Remove legacy projects archive HTML views
|
2019-08-21 17:08:27 +02:00 |
|
aignatov-bio
|
d70b7e2272
|
Make share status icon dynamic (#2007)
|
2019-08-21 15:32:57 +02:00 |
|
aignatov-bio
|
5e3f1d59f5
|
Fix inventory rows import (#1997)
|
2019-08-21 15:32:45 +02:00 |
|
Luka Murn
|
2db39c049e
|
Remove projects archive page
|
2019-08-21 13:10:54 +02:00 |
|
aignatov-bio
|
f94b8165dc
|
Fix marvinjs edit button and icon (#1985)
|
2019-08-21 11:15:57 +02:00 |
|
aignatov-bio
|
0b85dcbead
|
Fix long inventory names (#1999)
|
2019-08-21 10:39:48 +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 |
|
Anton Ignatov
|
a2c50cbe38
|
Add new permission check for share button
|
2019-08-20 15:08:53 +02:00 |
|
Mojca Lorber
|
530d09df64
|
add i-shared inventory icon
|
2019-08-19 15:43:55 +02:00 |
|
aignatov-bio
|
58d9be480f
|
Remove rename button from dropdown (#1994)
|
2019-08-19 14:29:38 +02:00 |
|
aignatov-bio
|
a505ef2462
|
Fix error in inventories for new teams [SCI-3788] (#1992)
* Fix error in inventories for new teams
* Replace with current team
|
2019-08-19 14:01:48 +02:00 |
|
aignatov-bio
|
b6661682ad
|
Fix shared inventory in task dropdown (#1993)
|
2019-08-19 13:56:02 +02:00 |
|
aignatov-bio
|
2cf7f52f15
|
Add inline editing for inventories [SCI-3763] (#1991)
* Add inline editing for inventories
* Remove old locals
* Markup fix
|
2019-08-19 13:30:56 +02:00 |
|
Urban Rotnik
|
89f289660b
|
Add share_with_all feature to service, add new activities
|
2019-08-14 11:03:15 +02:00 |
|
Urban Rotnik
|
0ce331227c
|
Update permission and model to share repository over all teams
|
2019-08-13 14:07:24 +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 |
|
aignatov-bio
|
aad726ac40
|
Update CSS for share modal (#1978)
|
2019-08-12 15:02:16 +02:00 |
|
Oleksii Kriuchykhin
|
c352a73d79
|
ActiveStorage fixies after latest master merge [SCI-3757]
|
2019-08-09 14:56:00 +02:00 |
|
Urban Rotnik
|
d04b0ccff1
|
Move '+ new inventory' link above list in sidebar
|
2019-08-09 14:15:51 +02:00 |
|
Urban Rotnik
|
7719b825e3
|
Update wording for sharing activities, rename button, add view-only paragraph
|
2019-08-09 14:15:51 +02:00 |
|
Urban Rotnik
|
23d7d117e9
|
Remove Repository's team from sharring list
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
32783576c1
|
Add controller action 'multiple_update'
Add controller action, add update permission activity, add JS for handling ajax req
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
2648521924
|
Invite modal with form
|
2019-08-09 14:15:49 +02:00 |
|
Urban Rotnik
|
466b05a5bc
|
Update repository index page
|
2019-08-09 14:15:48 +02:00 |
|
Mojca Lorber
|
26bd81621f
|
Add new icons also to the inventories list in navigation
|
2019-08-09 14:13:02 +02:00 |
|
Mojca Lorber
|
7d4941015f
|
Update global search, so it will be able to search through shared inventories
|
2019-08-09 14:13:01 +02:00 |
|
Mojca Lorber
|
7e9be932f3
|
Make scope for repositories accessible by teams and simplify read permission
|
2019-08-09 14:13:00 +02:00 |
|
Mojca Lorber
|
15432ac851
|
Make changes to inventory list in navigation based on new mockup
|
2019-08-09 14:13:00 +02:00 |
|
Mojca Lorber
|
cac7dab440
|
Show shared inventories in left navigation and fix read repository permission
|
2019-08-09 14:13:00 +02:00 |
|
Urban Rotnik
|
077369d960
|
Update permissions for Repositories
|
2019-08-09 14:12:59 +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 |
|
Oleksii Kriuchykhin
|
eaf9d59819
|
Merge branch 'activestorage_migration' into ok_SCI_3679
|
2019-08-06 15:27:31 +02:00 |
|
Urban Rotnik
|
50045b9796
|
Merge pull request #1956 from urbanrotnik/ur-sci-3733-add-button-new
Add additional NewStep button [SCI-3733]
|
2019-08-06 15:26:51 +02:00 |
|
Oleksii Kriuchykhin
|
423528933e
|
Switch to global JS constants [SCI-3679]
|
2019-08-06 15:06:19 +02:00 |
|
Anton Ignatov
|
e2e876b2a3
|
Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests
|
2019-08-05 13:51:04 +02:00 |
|
Jure Grabnar
|
d9f6c249f9
|
Fix CVE-2015-9284 omniauth security precautions
Close SCI-3588
|
2019-07-31 16:59:38 +02:00 |
|
Jure Grabnar
|
6546bd1532
|
Add omniauth-rails_csrf_protection gem
Close SCI-3588
|
2019-07-31 16:05:06 +02:00 |
|
Jure Grabnar
|
971f52b4b0
|
RTE image in search does not have preview (#1952)
RTE image in search does not have preview
|
2019-07-30 07:44:54 +02:00 |
|
Anton Ignatov
|
a4b2825258
|
Fix tests for active storage
|
2019-07-26 15:58:51 +02:00 |
|
Urban Rotnik
|
7626d43ee4
|
Merge pull request #1947 from urbanrotnik/ur-sci-3707-archived-results-not-in-row
Fix for archived results in row [SCI-3707]
|
2019-07-26 13:03:34 +02:00 |
|
Oleksii Kriuchykhin
|
ccf76b8531
|
Move repository_datatable to JS file [SCI-3679]
|
2019-07-26 13:00:25 +02:00 |
|
Urban Rotnik
|
88fbd6c0af
|
Fix for archived results in row
|
2019-07-26 11:16:53 +02:00 |
|
Urban Rotnik
|
aa36d93bea
|
Add additional NewStep button
|
2019-07-26 11:01:36 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +02:00 |
|
Oleksii Kriuchykhin
|
5e65b07bdc
|
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
|
2019-07-25 18:00:24 +02:00 |
|
Jure Grabnar
|
d3a5651998
|
Add remaining missing description in global search
Close SCI-3723
|
2019-07-25 14:27:53 +02:00 |
|
Jure Grabnar
|
11b3b7b4e9
|
Fix search description for step
|
2019-07-25 14:15:45 +02:00 |
|
Jure Grabnar
|
5847a8b05c
|
Convert HOT table after it was initialized
Closes SCI-3704
|
2019-07-23 14:17:22 +02:00 |
|
Anton Ignatov
|
1e8663548e
|
Add MarvinJS assets to TinyMCE
|
2019-07-16 13:40:54 +02:00 |
|
Anton Ignatov
|
3339c1fbbf
|
Add MarvinJS to Result and TinyMce MarvinJS refactor
|
2019-07-15 17:17:14 +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 |
|
aignatov-bio
|
3c32fe0895
|
Fix formulas in table report (#1934)
|
2019-07-15 13:27:27 +02:00 |
|
Urban Rotnik
|
5cf100a787
|
Show 'published_on' instead of 'created_on' on external_protocols list
|
2019-07-12 16:56:07 +02:00 |
|
mlorb
|
5bc8eb7392
|
Merge pull request #1921 from mlorb/ml-sci-3641
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
|
2019-07-12 15:52:40 +02:00 |
|
Anton Ignatov
|
ffd415d409
|
Inital refactor for Assets model
|
2019-07-12 15:02:06 +02:00 |
|
Anton Ignatov
|
7831b0a089
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 15:00:07 +02:00 |
|
Mojca Lorber
|
d07e04e511
|
Fix dooble flash_alerts load
|
2019-07-12 14:33:41 +02:00 |
|
aignatov-bio
|
4bae87e3f7
|
Styling changes in DOCX report [SCI-3633] (#1899)
* Styling changes in DOCX report
* Update result comments in docx report
* Fix markup
|
2019-07-12 13:48:14 +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 |
|
Mojca Lorber
|
f8afc92606
|
Fix page redirect and add success flash msg after protocols.io import action
|
2019-07-11 09:50:39 +02:00 |
|
aignatov-bio
|
ac7970209c
|
Add helper for inline JS code (#1916)
|
2019-07-11 09:31:30 +02:00 |
|
Oleksii Kriuchykhin
|
64b7a5646a
|
Implement custom document file previewer [SCI-3677]
|
2019-07-10 14:37:23 +02:00 |
|
aignatov-bio
|
7ac410e573
|
Fix visual bugs across ProtocolIo [SCI-3671] (#1914)
* Fix visual bugs across ProtocolIo
|
2019-07-10 13:00:32 +02:00 |
|
mlorb
|
23270393b0
|
Merge branch 'master' into ml-sci-3634
|
2019-07-09 14:38:00 +02:00 |
|
Mojca Lorber
|
7bb82e2fc2
|
Fix eternal protocols tab visuals
|
2019-07-09 14:35:40 +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 |
|
aignatov-bio
|
fc78d8f401
|
Fix tooltip position (#1909)
|
2019-07-09 14:00:53 +02:00 |
|
Urban Rotnik
|
be77746aef
|
Fix description styling of components
|
2019-07-09 13:41:51 +02:00 |
|
Oleksii Kriuchykhin
|
a1941a21dc
|
Futher refactoring of old Paperclip methods [SCI-3539]
|
2019-07-09 10:28:15 +02:00 |
|
aignatov-bio
|
4fe3119bd2
|
Fix step description RTE images in report preview (#1888)
|
2019-07-08 15:23:44 +02:00 |
|
aignatov-bio
|
01a01157d3
|
Replace Handson table in reports with simple table [SCI-3636] (#1895)
* Replace handsone table in reports with simple table
* Add result tables
|
2019-07-08 13:19:12 +02:00 |
|
Jure Grabnar
|
ae7da78bff
|
Merge pull request #1897 from jbargu/jg_sci_3646
[SCI-3646] Add paging functionality to external protocols
|
2019-07-08 13:06:19 +02:00 |
|
aignatov-bio
|
2baca019eb
|
Remove tooltip from step edit button (#1905)
|
2019-07-08 12:52:03 +02:00 |
|
Oleksii Kriuchykhin
|
9d926dc956
|
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
|
2019-07-05 16:56:05 +02:00 |
|
Mojca Lorber
|
989c10872c
|
Fixes visual bugs on protocols.io and home page
|
2019-07-04 18:22:51 +02:00 |
|
Jure Grabnar
|
dc7fee51fa
|
Add Show more protocols functionality to external protocols
Closes SCI-3646
|
2019-07-04 15:35:18 +02:00 |
|
Jure Grabnar
|
4c3df5a67d
|
Change tabs to spaces
|
2019-07-04 09:43:05 +02:00 |
|
Oleksii Kriuchykhin
|
c0c8e0e1a3
|
Refactor Experiment workflow images [SCI-3539]
|
2019-07-04 09:33:12 +02:00 |
|
Jure Grabnar
|
20134c9f8a
|
Features/protocolsio integration (#1893)
Features/protocolsio integration
|
2019-07-03 17:32:20 +02:00 |
|
Jure Grabnar
|
721bb9ab77
|
SCI-3649 All reagent data from step are not imported (#1881)
SCI-3649 All reagent data from step are not imported
|
2019-07-03 16:54:25 +02:00 |
|
Miha Mencin
|
5a437c0a0f
|
coding style fixes
|
2019-07-03 15:32:55 +02:00 |
|
Miha Mencin
|
964e91e1d2
|
removi mol weight from general section
|
2019-07-03 15:16:47 +02:00 |
|
Miha Mencin
|
012b828708
|
additional filters for blank string when displaying the reagent details
|
2019-07-03 14:13:55 +02:00 |
|
Miha Mencin
|
882e453b9c
|
Merge pull request #1880 from biosistemika/SCI-3644-hide-import-button
SCI-3644 Import button is always visible
|
2019-07-03 11:50:10 +02:00 |
|
Miha Mencin
|
611c417b43
|
code review changes
|
2019-07-03 09:21:41 +02:00 |
|
Miha Mencin
|
ab038ffdf7
|
SCI-3649 adding catalog number, fixing up the design a bit
|
2019-07-02 19:47:05 +02:00 |
|
Miha Mencin
|
74b4e0d774
|
SCI-3644 hide the import button and show it only on hover & when appropriate user
|
2019-07-02 18:24:07 +02:00 |
|
Miha Mencin
|
4efb0b5a4a
|
SCI-3645 added descending sorting by name
|
2019-07-02 17:42:55 +02:00 |
|
aignatov-bio
|
378e91b426
|
Fix links on search page (#1867)
|
2019-07-02 11:21:00 +02:00 |
|
Oleksii Kriuchykhin
|
4ea6b56582
|
Fix Step and Result file previews [SCI-3539]
|
2019-07-01 23:30:20 +02:00 |
|
Anton Ignatov
|
1f40fa69fc
|
Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
|
2019-07-01 11:51:27 +02:00 |
|
aignatov-bio
|
a08d93376c
|
Add promo modal when MarvinJS disabled (#1872)
|
2019-07-01 11:51:13 +02:00 |
|
Anton Ignatov
|
c9ae9f056e
|
Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration
|
2019-07-01 10:44:29 +02:00 |
|
aignatov-bio
|
2793777463
|
Features/docx report (#1873)
* Initial setup for docx report
* Add render for project, experiment, my_module
* Implement converter for RTE fields
* Add all report elements
* fix markup
* Change headers, remove empty blocks, refactored repository draw
* Add smart annotations support
* Fix justify fields
* Prepare for addons integration
* Fix markup
* Add comments to GemFile
* Fix TinyMCE error
* Change UI for new report download selector
* Fix file error in inventory cell for docx
* Fix i18n object for header
|
2019-07-01 10:14:16 +02:00 |
|
Anton Ignatov
|
390002f40f
|
Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539
|
2019-07-01 10:12:26 +02:00 |
|
Oleksii Kriuchykhin
|
5acb16d43e
|
Update Asset helper methods [SCI-3539]
|
2019-06-28 08:17:09 +02:00 |
|
Jure Grabnar
|
bc4b07cc0f
|
Refactor hardcoded protocol_source in SearchService
|
2019-06-28 02:26:31 +02:00 |
|
Jure Grabnar
|
1ccabf62b3
|
Add preview banner in external protocols
|
2019-06-28 01:38:33 +02:00 |
|
Jure Grabnar
|
d3afcbed50
|
Style card view on external protocols
Closes SCI-3535
|
2019-06-28 00:43:05 +02:00 |
|
Jure Grabnar
|
0a77cedaf8
|
Fix sorting of external protocols and start showing results
|
2019-06-27 22:48:56 +02:00 |
|
Jure Grabnar
|
8338892fc6
|
Update external protocols form to include sort_by
|
2019-06-27 21:26:28 +02:00 |
|
Urban Rotnik
|
9cb4454537
|
New implementation for attachments creation
|
2019-06-27 17:02:06 +02:00 |
|
Urban Rotnik
|
1fd0ca6795
|
Add steps preview
|
2019-06-27 16:46:02 +02:00 |
|
Urban Rotnik
|
2761079479
|
Add modal for import
|
2019-06-27 16:46:02 +02:00 |
|
Anton Ignatov
|
31c6802a06
|
Add support for marvinjs on service
|
2019-06-23 00:09:49 +02:00 |
|
Anton Ignatov
|
8240c8baad
|
Initial refactoring for remote api support
|
2019-06-22 01:51:59 +02:00 |
|
Anton Ignatov
|
7e5c39d3e4
|
Merge branch 'master' into features/marvinjs-integration
|
2019-06-21 14:51:45 +02:00 |
|
Alex Kriuchykhin
|
db7c6435b3
|
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-20 11:31:15 +02:00 |
|
Jure Grabnar
|
b3c3b68dc2
|
Add external preview to External Protocols tab
Closes SCI-3563
|
2019-06-19 22:54:20 +02:00 |
|
aignatov-bio
|
4ddcbe5d75
|
Fix user permission for recent protocols (#1843)
|
2019-06-19 14:06:02 +02:00 |
|
Urban Rotnik
|
bf6041e13d
|
Update sanitization of html descriptions
|
2019-06-19 11:05:22 +02:00 |
|
Urban Rotnik
|
2a579f2240
|
Add Warnings, Before start and Guidelinese to protocol description
|
2019-06-19 09:02:42 +02:00 |
|
Jure Grabnar
|
4f6397b5b9
|
Add form to external_sources#new action
Closes SCI-3532
|
2019-06-17 12:24:15 +02:00 |
|
Jure Grabnar
|
f7c6f78925
|
Add external_protocols#index action
|
2019-06-17 12:24:14 +02:00 |
|
Jure Grabnar
|
7adef9cc9e
|
Change sort buttons positions
Closes SCI-3534
|
2019-06-17 12:24:13 +02:00 |
|
Jure Grabnar
|
d103f8ffec
|
Finish external protocols screen
Closes SCI-3534
|
2019-06-17 12:24:12 +02:00 |
|
Jure Grabnar
|
0b60da9b4c
|
Add ExternalProtocols skeleton tab
|
2019-06-17 12:24:12 +02:00 |
|
Urban Rotnik
|
2bb4f558b7
|
View rendering simplified, small improvements
|
2019-06-17 12:24:09 +02:00 |
|
Urban Rotnik
|
807104035c
|
Add StepBuilder, TableBuilder, AssetBuilder for PIO, normalized updated
|
2019-06-17 12:24:09 +02:00 |
|
aignatov-bio
|
da8d748c49
|
Fix small comments bugs (#1832)
|
2019-06-14 16:20:47 +02:00 |
|
aignatov-bio
|
7a3eedf461
|
Adding missing avatars to comments (#1838)
|
2019-06-14 16:20:13 +02:00 |
|
aignatov-bio
|
52a2f5cd0e
|
Add recent protocols dropdown to task page [SCI-3417] (#1800)
* Add recent protocols dropdown to task page
|
2019-06-13 15:47:29 +02:00 |
|
Alex Kriuchykhin
|
599274eb13
|
Merge pull request #1830 from okriuchykhin/ok_SCI_3528
Make repositories more extendable [SCI-3528]
|
2019-06-13 09:45:18 +02:00 |
|
Oleksii Kriuchykhin
|
a855eade4c
|
Merge branch 'master' into ok_SCI_3461
|
2019-06-11 17:48:02 +02:00 |
|
Oleksii Kriuchykhin
|
6e1a7a3392
|
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-11 10:08:33 +02:00 |
|
Oleksii Kriuchykhin
|
8920d38a02
|
Make repositories more extendable [SCI-3528]
|
2019-06-06 17:28:59 +02:00 |
|
Oleksii Kriuchykhin
|
e543a849d4
|
Add document file preview generation with LibreOffice [SCI-3145]
|
2019-06-05 14:52:30 +02:00 |
|
Alex Kriuchykhin
|
db399864f8
|
Merge pull request #1820 from okriuchykhin/ok_SCI_3526
Update Handsontable to 6.2.2 [SCI-3526]
|
2019-06-04 14:59:22 +02:00 |
|
aignatov-bio
|
d207cf5dce
|
Refactored comments over SciNote [SCI-3505] (#1808)
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
|
2019-06-04 14:40:21 +02:00 |
|
Oleksii Kriuchykhin
|
01a5a17bb4
|
Update Handsontable to 6.2.2 [SCI-3526]
|
2019-06-04 14:31:37 +02:00 |
|
aignatov-bio
|
cd7460a4bd
|
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
|
2019-05-31 15:44:27 +02:00 |
|
Anton Ignatov
|
c9a29b12ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-31 10:27:14 +02:00 |
|
Mojca Lorber
|
a3c29738bb
|
Hide create office file button to user without permission
|
2019-05-27 14:58:10 +02:00 |
|
Oleksii Kriuchykhin
|
84a2ad4487
|
Refactor the async thumbnail reloading (spinner) [SCI-3461]
|
2019-05-21 17:29:33 +02:00 |
|
aignatov-bio
|
2cee46a10d
|
Fix experiment name length (#1789)
|
2019-05-21 15:54:01 +02:00 |
|
aignatov-bio
|
d97e803d01
|
Adding placeholder to TinyMCE editor (#1788)
|
2019-05-21 15:53:47 +02:00 |
|
aignatov-bio
|
2de2ead723
|
Refactor avatar image appearance across Scinote [SCI-3482] (#1787)
* Refactor avatar appearance across Scinote
|
2019-05-21 15:19:44 +02:00 |
|
aignatov-bio
|
5081546c78
|
Fix padding for protocol description (#1782)
|
2019-05-21 10:21:30 +02:00 |
|
Oleksii Kriuchykhin
|
1128fedc51
|
Refactor title inline editing permission checking [SCI-3471]
|
2019-05-20 13:13:31 +02:00 |
|
Alex Kriuchykhin
|
df59c54bd4
|
Merge pull request #1776 from okriuchykhin/ok_SCI_3477
Fix protocol metadata editing in repository [SCI-3477]
|
2019-05-17 09:42:13 +02:00 |
|
Oleksii Kriuchykhin
|
488fc99dae
|
Fix protocol metadata editing in repository [SCI-3477]
|
2019-05-16 17:11:17 +02:00 |
|
Anton Ignatov
|
dcb6162ded
|
Fix merge error
|
2019-05-16 09:40:02 +02:00 |
|
Anton Ignatov
|
259b75a6ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-16 09:28:48 +02:00 |
|
Alex Kriuchykhin
|
bcbaf73669
|
Merge pull request #1773 from okriuchykhin/ok_SCI_3468
Add permission checking to inline editor fields [SCI-3468]
|
2019-05-15 17:49:15 +02:00 |
|
Oleksii Kriuchykhin
|
2ef926e795
|
Add permission checking to inline editor fields [SCI-3468]
|
2019-05-15 17:47:09 +02:00 |
|
Alex Kriuchykhin
|
607356ce1b
|
Merge pull request #1771 from okriuchykhin/ok_SCI_3466
Show task due date in UTC [SCI-3466]
|
2019-05-15 15:30:17 +02:00 |
|
Oleksii Kriuchykhin
|
71a4a1348a
|
Show task due date in UTC [SCI-3466]
|
2019-05-15 15:17:44 +02:00 |
|
aignatov-bio
|
24e30867da
|
Add smart annotation to comments [SCI-3458] (#1768)
* Add smart annotation to comments
|
2019-05-15 14:59:15 +02:00 |
|
aignatov-bio
|
f970eea525
|
Some gui fixes (#1757)
|
2019-05-14 09:43:02 +02:00 |
|
Oleksii Kriuchykhin
|
4b1c4bd140
|
Fix handling of proccessing step attachments [SCI-3381]
|
2019-05-13 17:12:06 +02:00 |
|
Anton Ignatov
|
652fba0e23
|
Merge branch 'master-with-note-section'
|
2019-05-13 11:08:11 +02:00 |
|
Miha Mencin
|
765c6ebd6a
|
Merge pull request #1747 from biosistemika/lm-sci-3438-fix
Fix TinyMCE images in task description and task protocol description view [SCI-3438]
|
2019-05-13 10:56:30 +02:00 |
|
Miha Mencin
|
5ff344c208
|
Merge pull request #1746 from biosistemika/lm-sci-3426
Changes to create new office file button [SCI-3426]
|
2019-05-13 10:55:58 +02:00 |
|
aignatov-bio
|
d3aa6371cd
|
Fix report saving [SCI-3443] (#1753)
* Fix report saving
* Fix the report saving by using the reports' structures
* Remove uneccesary yarn.lock (mistake)
|
2019-05-13 10:55:08 +02:00 |
|
aignatov-bio
|
71b3228310
|
Update protocol preview style [SCI-3416] (#1729)
* Update protocol appearance
|
2019-05-13 10:45:12 +02:00 |
|
aignatov-bio
|
0b194eb3b1
|
Revert "Fix report saving (#1748)" (#1752)
This reverts commit 3db6129808 .
|
2019-05-13 09:09:36 +02:00 |
|
aignatov-bio
|
3db6129808
|
Fix report saving (#1748)
|
2019-05-13 08:58:47 +02:00 |
|
Anton Ignatov
|
e5b4adcc25
|
Merge branch 'master-with-note-section' into features/marvinjs-integration
|
2019-05-11 20:51:01 +02:00 |
|
aignatov-bio
|
634b58bd6a
|
Various UX improvements for note section [SCI-3444] (#1742)
* Various UX improvments for note section
|
2019-05-11 16:04:28 +02:00 |
|
Luka Murn
|
059ebf6f27
|
Fix task and protocol description (TinyMCE) rendering on task page
Closes SCI-3438.
|
2019-05-10 20:39:26 +02:00 |
|
Luka Murn
|
584cf4b93b
|
Change Office icon on the create New Office buttons
|
2019-05-10 17:51:29 +02:00 |
|
Luka Murn
|
5135922254
|
Move the WOPI controls partial to /wopi folder, fix typo
|
2019-05-10 16:51:54 +02:00 |
|
Luka Murn
|
b78caef915
|
Fix the file preview modal so it supports WOPI_ENABLED == false
|
2019-05-10 16:41:11 +02:00 |
|
Anton Ignatov
|
995408e7fc
|
Fix protocol update error, rollback bootstrap gems and fix step name
|
2019-05-08 17:18:19 +02:00 |
|
Anton Ignatov
|
b5271bdd2c
|
Add remote api support
|
2019-05-08 15:00:36 +02:00 |
|
Anton Ignatov
|
dcf94e78e1
|
Merge branch 'master-with-note-section' into feature/marvinjs-integration
|
2019-05-08 14:03:41 +02:00 |
|
Urban Rotnik
|
357c6e6b98
|
Change ordering by created_at instead by last_time_changed_at
|
2019-05-08 08:37:34 +02:00 |
|
Miha Mencin
|
7c088c8432
|
Merge pull request #1725 from aignatov-bio/ai-sci-3411-due-date-in-one-line
Fix due date position [SCI-3411]
|
2019-05-07 16:34:23 +02:00 |
|
Anton Ignatov
|
0e1e7c3d82
|
Fix button icon for uncomplete task
|
2019-05-06 16:35:46 +02:00 |
|
Anton Ignatov
|
2a294c408f
|
Fix due date alignment and chage header structure from bootstrap to flexbox
|
2019-05-06 16:20:00 +02:00 |
|
Alex Kriuchykhin
|
3f0401bf9a
|
Merge pull request #1709 from okriuchykhin/ok_SCI_3398
Fix TinyMCE for results [SCI-3398]
|
2019-05-06 10:47:11 +02:00 |
|
mlorb
|
df16b54be0
|
Merge pull request #1719 from mlorb/ml-sci-3399
Visual fixes for edit/add step on protocol [SCI-3399]
|
2019-05-06 10:33:28 +02:00 |
|
aignatov-bio
|
cc8a152278
|
Fix step attachments sorting (#1718)
|
2019-05-06 09:56:26 +02:00 |
|
Anton Ignatov
|
565a4959b4
|
small fixes and improvments
|
2019-05-03 15:24:28 +02:00 |
|
Anton Ignatov
|
88e67a16c2
|
Merge branch 'master-with-note-section' into feature/marvinjs-integration
|
2019-05-02 16:16:03 +02:00 |
|
Anton Ignatov
|
fef691d30f
|
Add error handling and secutiry checks
|
2019-05-02 16:12:25 +02:00 |
|
Anton Ignatov
|
4d0d5aa014
|
Adding team sketches selector
|
2019-04-30 17:32:55 +02:00 |
|
Mojca Lorber
|
7be151bd2d
|
Visual fixes for edit/add step on protocol
|
2019-04-30 14:57:50 +02:00 |
|
aignatov-bio
|
60296419e8
|
Update project card due date dropdown (#1716)
|
2019-04-30 13:30:09 +02:00 |
|
Anton Ignatov
|
7c55fcf0cf
|
Merge branch 'master' into master-with-note-section
|
2019-04-30 12:07:59 +02:00 |
|
mlorb
|
9f0983de77
|
Merge pull request #1706 from mlorb/ml-sci-3350
Change ownership of inventory items, when a user leaves a team [SCI-3350]
|
2019-04-30 10:39:14 +02:00 |
|
aignatov-bio
|
26dc1a0a4a
|
Note section css issues [SCI-3378] (#1715)
* Fix step name width bug
|
2019-04-30 10:23:44 +02:00 |
|
Anton Ignatov
|
2847ec7609
|
Add env variable and check for MarvinJS available
|
2019-04-28 17:08:18 +02:00 |
|
Anton Ignatov
|
260810fff8
|
Add editing mode for tinymce images
|
2019-04-28 16:16:31 +02:00 |
|
Anton Ignatov
|
54731856f0
|
Finish step chemical attachments
|
2019-04-27 19:08:40 +02:00 |
|
Anton Ignatov
|
cf4ff41ec6
|
Add delete feature
|
2019-04-27 13:51:35 +02:00 |
|
Anton Ignatov
|
46f0e0c0c2
|
Add marvin js assets to assets sort and name field
|
2019-04-27 12:46:45 +02:00 |
|
Anton Ignatov
|
fe620c4a63
|
Add marvin model and controller
|
2019-04-26 22:59:38 +02:00 |
|
Anton Ignatov
|
baa9b94a63
|
Add new graph button to step
|
2019-04-26 20:33:20 +02:00 |
|
Anton Ignatov
|
40c1c9aef7
|
Add marvin js modal
|
2019-04-26 18:24:21 +02:00 |
|
Oleksii Kriuchykhin
|
077ad52d4b
|
Fix TinyMCE for results [SCI-3398]
|
2019-04-26 17:37:01 +02:00 |
|
Miha Mencin
|
970a9b42ed
|
Update hilightjs github theme path
|
2019-04-26 17:29:14 +02:00 |
|
Urban Rotnik
|
dba1ccfc34
|
Merge pull request #1705 from urbanrotnik/ur-sci-3387-office-files-icons
Show icons for office files [SCI-3387]
|
2019-04-26 15:53:53 +02:00 |
|
Urban Rotnik
|
090df87f48
|
Merge pull request #1703 from urbanrotnik/ur-sci-3382-duplicated-complete-button
Remove duplicated button [SCI-3382]
|
2019-04-26 15:46:57 +02:00 |
|
aignatov-bio
|
57b80280dc
|
Update attachemnts css (#1700)
|
2019-04-26 15:20:39 +02:00 |
|
Mojca Lorber
|
eac90109f7
|
Change ownership of inventory items, when a user leaves a team
|
2019-04-26 10:47:08 +02:00 |
|
Urban Rotnik
|
c41413234c
|
Use MS office icons for MS files
|
2019-04-26 09:29:39 +02:00 |
|
Urban Rotnik
|
c94d3ce950
|
Remove duplicated button
|
2019-04-26 07:57:46 +02:00 |
|
Oleksii Kriuchykhin
|
66631ba26c
|
Fix loading more activities on task page [SCI-3390]
|
2019-04-25 23:50:00 +02:00 |
|
aignatov-bio
|
1a860037f7
|
Update reports for new RTE [SCI-3263] (#1691)
* Update reports for new RTE
|
2019-04-25 16:16:43 +02:00 |
|
Urban Rotnik
|
0cf688be39
|
Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes
Comments section changes [SCI-3135]
|
2019-04-25 14:18:05 +02:00 |
|
Anton Ignatov
|
0779ed598b
|
Reuse inline editing logic
|
2019-04-25 11:14:55 +02:00 |
|
Anton Ignatov
|
e52b985e7b
|
xMerge branch 'ur-sci-3135-comments-section-changes' of https://github.com/urbanrotnik/scinote-web into urbanrotnik-ur-sci-3135-comments-section-changes
|
2019-04-24 13:40:41 +02:00 |
|
aignatov-bio
|
84993ea3ef
|
Update protocol repository for new description format [SCI-3371] (#1689)
* Update protocol repository for new description format
* move image clone method to concerns
|
2019-04-24 13:34:56 +02:00 |
|
Oleksii Kriuchykhin
|
88123f5ecd
|
Fix paths for highlightjs-github-theme [SCI-3377]
|
2019-04-24 12:35:01 +02:00 |
|
Urban Rotnik
|
774521df7a
|
Changes to comments section in Task Steps
|
2019-04-23 15:02:58 +02:00 |
|
Urban Rotnik
|
11a7a975af
|
Merge branch 'features/scinote-improvements' into master-with-note-section
|
2019-04-23 14:50:03 +02:00 |
|
Urban Rotnik
|
7a2bfc12ce
|
Remove form_asset partial
|
2019-04-23 13:50:48 +02:00 |
|
Urban Rotnik
|
b1dabaca15
|
New helper for file thumbnails
|
2019-04-23 13:50:48 +02:00 |
|
Urban Rotnik
|
ea0368aa11
|
Attachments update for edit page
|
2019-04-23 13:50:47 +02:00 |
|
Anton Ignatov
|
7d60eb5572
|
Fix migration issues
|
2019-04-23 11:11:22 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
aignatov-bio
|
6b45dcd475
|
Update eln export for new tinyMCE image format (#1680)
|
2019-04-19 14:44:40 +02:00 |
|
Jure Grabnar
|
1295c0583a
|
Archived results are now separated in exported project
Closes SCI-3179
|
2019-04-17 16:37:21 +02:00 |
|
mlorb
|
1e3d0e901a
|
Merge pull request #1667 from mlorb/ml-sci-3304
Fix links in activity message for protocols in repository [SCI-3304]
|
2019-04-15 11:55:08 +02:00 |
|
Anton Ignatov
|
dd8b3caf65
|
Fix duplicate activtiy issue and fix link to inventory
|
2019-04-15 11:35:30 +02:00 |
|
Alex Kriuchykhin
|
3250ab70f4
|
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2
Switch to kaminari pagination in global activities [SCI-3292]
|
2019-04-12 16:04:48 +02:00 |
|
Oleksii Kriuchykhin
|
231106e131
|
Switch to kaminari pagination in global activities [SCI-3292]
|
2019-04-12 15:37:45 +02:00 |
|
Mojca Lorber
|
252fdaf9a8
|
Fix links in activity message for protocols in repository
|
2019-04-12 15:14:41 +02:00 |
|
Mojca Lorber
|
bf2e9e8194
|
Rename button load more system notification to fix the bug
|
2019-04-12 11:58:47 +02:00 |
|
aignatov-bio
|
8ba0555922
|
Add check for tasks complete in project notifications (#1657)
|
2019-04-12 09:17:34 +02:00 |
|
aignatov-bio
|
ffb0db06b9
|
Add scroll to team selector (#1659)
|
2019-04-12 09:17:14 +02:00 |
|
Alex Kriuchykhin
|
7f20b7fa20
|
Merge pull request #1661 from okriuchykhin/ok_SCI_3292
Improve global activities pagination and fetching [SCI-3292]
|
2019-04-11 16:23:37 +02:00 |
|
Oleksii Kriuchykhin
|
d378e33038
|
Improve global activities pagination and fetching [SCI-3292]
|
2019-04-10 15:45:17 +02:00 |
|
aignatov-bio
|
f47d0e2932
|
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload
Improve the image file upload into RTE input fields [SCI-3131]
|
2019-04-10 14:04:06 +02:00 |
|
aignatov-bio
|
7ef7e2397f
|
Change activity filter order and reduce custom date label size [SCI-3301] (#1651)
* Change activity filter order and reduce custom date label size
* Fix hound
|
2019-04-09 14:18:22 +02:00 |
|
Urban Rotnik
|
ee3dc571e1
|
Update attachments view, add ordering on FE
|
2019-04-09 14:17:40 +02:00 |
|
Urban Rotnik
|
a3932cc67f
|
New asset box style update
|
2019-04-09 14:17:40 +02:00 |
|
aignatov-bio
|
e2e299b424
|
Add dynamic generating filters for global activities [SCI-3228] (#1644)
* Add dynamic generating filters
* Add url methods
|
2019-04-09 09:08:27 +02:00 |
|
Urban Rotnik
|
26cf8271a1
|
Change step header, remove vertical line
|
2019-04-05 10:57:38 +02:00 |
|
Jure Grabnar
|
7ac88ee84b
|
Change icons to be relative
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
cbf109f884
|
Fix create WOPI file button
Closes SCI-3137
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
fddff9c627
|
Perform styling on the WOPI modal
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
38e47b93ab
|
Update labels
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
b12916b828
|
Add main functionality
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
613843d095
|
Temp commit
|
2019-04-04 16:58:55 +02:00 |
|
Jure Grabnar
|
9a4cd4fda2
|
Add file_present true
|
2019-04-04 16:57:36 +02:00 |
|
Jure Grabnar
|
3b8e6fa47c
|
Test office online
|
2019-04-04 16:57:36 +02:00 |
|
Oleksii Kriuchykhin
|
d6bd703ec8
|
Fix activity genereation with discarded inventories [SCI-3290]
|
2019-04-03 21:18:48 +02:00 |
|
Jure Grabnar
|
26848ecaef
|
Refactor step position + 1 into a method
|
2019-04-03 13:07:30 +02:00 |
|
Oleksii Kriuchykhin
|
c47d243b1f
|
Disable WOPI edit button in read only mode [SCI-3281]
|
2019-04-02 17:45:26 +02:00 |
|
Oleksii Kriuchykhin
|
ffa7c5ecb2
|
Fix permition checks for file editing and make protocol preview files read only [SCI-3281]
|
2019-04-02 16:38:53 +02:00 |
|
Jure Grabnar
|
ac1b43165d
|
Merge pull request #1625 from jbargu/jg_sci_3257
Remove html_safe on activities [SCI-3257]
|
2019-04-02 12:04:01 +02:00 |
|
aignatov-bio
|
e6102c72c7
|
Adding missed activities [SCI-3253] (#1614)
* Adding missed activties
* Adding test for activities
|
2019-04-02 11:50:37 +02:00 |
|
Jure Grabnar
|
8443ed0fb3
|
Add sanitize input to old activity messages
|
2019-04-02 11:25:07 +02:00 |
|
Jure Grabnar
|
5dd0cf091f
|
Remove html_safe from activites head title
|
2019-04-02 11:16:08 +02:00 |
|
aignatov-bio
|
e93b0c3109
|
Adding preload filters for global activities [SCI-3254] (#1619)
* Adding preload filter for global activities
* Adding link to task activities
|
2019-04-02 11:14:36 +02:00 |
|
Urban Rotnik
|
6ec22c0b3b
|
Merge pull request #1618 from urbanrotnik/ur-sci-3240-missing-activities-of-intentory
Missing activities, fix for showing report name, add step positions, fixed links [SCI-3240] [SCI-3246]
|
2019-04-02 11:02:57 +02:00 |
|
Jure Grabnar
|
85bbdcf4b3
|
Remove .html_safe from activity
Closes SCI-3257
|
2019-04-02 11:02:22 +02:00 |
|
aignatov-bio
|
daaa6a367b
|
Adding custom scrollbar to global activities [SCI-3206] (#1623)
* Adding custom scrollbar to global activities
|
2019-04-02 09:56:50 +02:00 |
|
Urban Rotnik
|
b91f08fe99
|
Add activity for copying Inventory and Invetory item
|
2019-04-01 15:40:00 +02:00 |
|
Alex Kriuchykhin
|
b3aa6be23d
|
Merge pull request #1621 from okriuchykhin/ok_SCI_3255
Add global activities to reports [SCI-3255]
|
2019-04-01 15:07:06 +02:00 |
|
Oleksii Kriuchykhin
|
98e58ff7eb
|
Add global activities to reports [SCI-3255]
|
2019-04-01 11:26:51 +02:00 |
|
Mojca Lorber
|
3c69225d6b
|
Change activities for task protocols
|
2019-03-29 15:09:20 +01:00 |
|
aignatov-bio
|
ce7bbd6b07
|
Adding deselect button to objects filter and some localizations fix (#1608)
|
2019-03-29 09:04:58 +01:00 |
|
Alex Kriuchykhin
|
9137740266
|
Merge pull request #1607 from okriuchykhin/ok_SCI_3229
Fix links for archived objects in global activities [SCI-3229][SCI-3241]
|
2019-03-28 17:32:24 +01:00 |
|
Oleksii Kriuchykhin
|
5008339d81
|
Add handling of links for objects from another team [SCI-3229][SCI-3241]
|
2019-03-28 14:56:34 +01:00 |
|
Oleksii Kriuchykhin
|
d7d45bec70
|
Fix links for archived objects in global activities [SCI-3229]
|
2019-03-28 13:43:50 +01:00 |
|
aignatov-bio
|
08263ab64e
|
adding filters for task activities [SCI-3076] (#1553)
* update task activity screen
|
2019-03-28 10:55:48 +01:00 |
|
Urban Rotnik
|
685b7138b7
|
Merge pull request #1597 from urbanrotnik/ur-SCI-3224-add-message-for-empty-activity-list
Add message for empty activity list [SCI-3224]
|
2019-03-28 09:16:29 +01:00 |
|
Urban Rotnik
|
d0a8652969
|
Add message for empty activity list
|
2019-03-28 09:14:01 +01:00 |
|
Anton Ignatov
|
03123c34f8
|
adding date placeholder
|
2019-03-27 14:39:29 +01:00 |
|
Anton Ignatov
|
1d244508f5
|
Adding placeholders to filters
|
2019-03-27 11:19:58 +01:00 |
|
Miha Mencin
|
1b19e67c07
|
Revert "Step header changes, removed vertical line"
This reverts commit b0f0ded87d .
|
2019-03-27 10:21:40 +01:00 |
|
Urban Rotnik
|
2487089dd3
|
Rename dropdown labels for Activities, Users and Teams
|
2019-03-27 05:47:54 +01:00 |
|
Miha Mencin
|
c3c940b7a3
|
Merge pull request #1595 from biosistemika/SCI-3236-bug-when-adding-result-commnet
[SCI-3236] showing font-awesome icon based on result type
|
2019-03-26 17:14:30 +01:00 |
|
Miha Mencin
|
8e12e0f5b3
|
[SCI-3236] showing font-awesome icon based on result type
|
2019-03-26 17:04:31 +01:00 |
|
aignatov-bio
|
6012513c13
|
Reduce font size of filters title [SCI-3208] (#1592)
* reduce font size of filters titles;
* fix new title
|
2019-03-26 16:47:36 +01:00 |
|
Alex Kriuchykhin
|
935e3a65cf
|
Merge pull request #1586 from okriuchykhin/ok_SCI_3199
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
|
2019-03-26 16:02:44 +01:00 |
|
aignatov-bio
|
54fd3a748b
|
Adding activity groups [SCI-3203] (#1588)
* Adding activty groups
|
2019-03-26 15:29:21 +01:00 |
|
Urban Rotnik
|
68d87efaa0
|
Merge pull request #1582 from urbanrotnik/ur-SCI-3134-changes-to-step-design
Step header changes, removed vertical line [SCI-3134]
|
2019-03-26 12:38:04 +01:00 |
|
Urban Rotnik
|
80cd01c2e5
|
Merge pull request #1587 from urbanrotnik/ur-SCI-3207-remove-search-field
Comment out search field for global activities [SCI-3207]
|
2019-03-26 12:37:07 +01:00 |
|
aignatov-bio
|
cee3796f35
|
Merge pull request #1583 from aignatov-bio/ai-sci-3203-show-selection-left
Move dropdown container to left [SCI-3203]
|
2019-03-26 09:37:12 +01:00 |
|
Urban Rotnik
|
790f4450cc
|
Comment out search field for global activities
|
2019-03-25 18:15:31 +01:00 |
|
Oleksii Kriuchykhin
|
e3a3ec4491
|
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225]
|
2019-03-25 17:38:13 +01:00 |
|
Urban Rotnik
|
b0f0ded87d
|
Step header changes, removed vertical line
SCI-3134
|
2019-03-25 17:25:13 +01:00 |
|
Miha Mencin
|
4a87216a3d
|
Merge branch 'master' into features/global-activities
|
2019-03-25 14:35:24 +01:00 |
|
Anton Ignatov
|
2d5df1b3b7
|
Moving dropdown container to left
|
2019-03-25 13:56:32 +01:00 |
|
aignatov-bio
|
fd6e622b95
|
Merge pull request #1579 from aignatov-bio/ai-sci-3205-remove-whitespace-for-dates
Remove white spaces for date in global activities [SCI-3205]
|
2019-03-25 12:58:35 +01:00 |
|
Anton Ignatov
|
c584a0d606
|
Remove white spaces for date in global activites
|
2019-03-25 11:06:00 +01:00 |
|
Anton Ignatov
|
c8c211f245
|
Remove whitespace to breadcrumbs
|
2019-03-25 09:39:17 +01:00 |
|
Jure Grabnar
|
171b2eeedc
|
Remove the title of protocol steps when empty
Closes SCI-3072
|
2019-03-25 09:36:56 +01:00 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +01:00 |
|
Anton Ignatov
|
bc58f0aecd
|
Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload
|
2019-03-21 11:48:51 +01:00 |
|
aignatov-bio
|
e8827b0d74
|
Update tags in task info [SCI-3093] (#1575)
* Adding inline tags selection
|
2019-03-21 10:13:07 +01:00 |
|
Anton Ignatov
|
07c2819163
|
refactoring tinymce image uploading
|
2019-03-20 14:46:54 +01:00 |
|
Oleksii Kriuchykhin
|
0c2b7959b6
|
Fix smart annotations in RTE [SCI-3111]
|
2019-03-20 11:41:36 +01:00 |
|
Anton Ignatov
|
29b67be127
|
Fix team selection in global activities and add link from navbar
|
2019-03-20 10:33:22 +01:00 |
|
Oleksii Kriuchykhin
|
b46f3566ef
|
Fix rendering of HTML in RTE fields [SCI-3111]
|
2019-03-19 23:32:24 +01:00 |
|
Oleksii Kriuchykhin
|
eb3d1ea6fe
|
Update RTE for step description [SCI-3111]
|
2019-03-19 17:42:49 +01:00 |
|
Urban Rotnik
|
1017836c0e
|
Activities service fix
|
2019-03-19 14:12:39 +01:00 |
|
Urban Rotnik
|
fe35c805b7
|
Add model breadcrumbs, update activities_helper
|
2019-03-19 14:01:06 +01:00 |
|
aignatov-bio
|
6eae12efab
|
Updating permission check for image editing [SCI - 3153, 3159] (#1568)
*Add permission check for assets editing
* Add check for image format
|
2019-03-19 13:52:57 +01:00 |
|
Anton Ignatov
|
87280f083a
|
[SCI-3166] Finalize global activities front end
|
2019-03-19 13:50:55 +01:00 |
|
Alex Kriuchykhin
|
7db53fad7c
|
Merge pull request #1566 from okriuchykhin/ok_SCI_3062
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
|
2019-03-19 13:28:05 +01:00 |
|
Oleksii Kriuchykhin
|
0c71493fdb
|
Add viewing permissions for global activities [SCI-2997]
|
2019-03-18 15:38:19 +01:00 |
|
Oleksii Kriuchykhin
|
5bc41c1f06
|
Fix task tags field after merging latest master to feature branch
|
2019-03-15 14:21:34 +01:00 |
|
Oleksii Kriuchykhin
|
a822227383
|
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
|
2019-03-14 16:27:33 +01:00 |
|
Oleksii Kriuchykhin
|
645930b8d7
|
Merge branch 'master' into features/note-section
|
2019-03-14 16:25:51 +01:00 |
|
Oleksii Kriuchykhin
|
9bbdc8fc89
|
Include tui image editor with webpack [SCI-2856]
|
2019-03-11 15:12:38 +01:00 |
|
Oleksii Kriuchykhin
|
feb75f62e1
|
Add workaround for image caching in fabric js [SCI-2855]
|
2019-03-11 15:10:32 +01:00 |
|
Oleksii Kriuchykhin
|
80e525fd97
|
Improve image editor behaviour [SCI-2855]
|
2019-03-11 15:09:49 +01:00 |
|
Oleksii Kriuchykhin
|
89e968c410
|
Add tui.image-editor [SCI-2815]
|
2019-03-11 15:08:15 +01:00 |
|
Oleksii Kriuchykhin
|
e3bacd6b9a
|
Fix global activities page after refactoring [SCI-2994][SCI-3024]
|
2019-03-08 13:09:27 +01:00 |
|
Oleksii Kriuchykhin
|
0b87e8e1e4
|
Merge branch 'features/global-activities' into ok_SCI_3024_v3
|
2019-03-08 10:29:51 +01:00 |
|
Alex Kriuchykhin
|
bb29a97962
|
Merge pull request #1557 from okriuchykhin/ok_SCI_3151
Improve JS files inclusion in export all [SCI-3151]
|
2019-03-07 17:46:45 +01:00 |
|
Oleksii Kriuchykhin
|
af9daf3a5e
|
Improve JS files inclusion in export all [SCI-3151]
|
2019-03-07 17:42:47 +01:00 |
|
Alex Kriuchykhin
|
ec1aec3bf1
|
Merge pull request #1556 from okriuchykhin/ok_SCI_3048
Fix local storage file download links [SCI-3048]
|
2019-03-07 16:58:30 +01:00 |
|
Oleksii Kriuchykhin
|
0c99ea9c5c
|
Fix local storage file download links [SCI-3048]
|
2019-03-07 16:46:05 +01:00 |
|
Oleksii Kriuchykhin
|
8cc95bf491
|
Embed tables JS files to main HTML of Export All [SCI-3151]
|
2019-03-07 14:23:10 +01:00 |
|
aignatov-bio
|
ec2dbb897f
|
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521)
* Adding side pane filtering and top pane
|
2019-03-06 10:34:04 +01:00 |
|
aignatov-bio
|
125d2a3b9b
|
New inline tags editing in task [SCI 3093] (#1529)
* Adding inline tags selection
|
2019-03-06 09:18:45 +01:00 |
|
aignatov-bio
|
b1df8c9aa7
|
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524)
* Adding inline editing to experiment title, project title and task title
|
2019-03-06 09:17:34 +01:00 |
|
Oleksii Kriuchykhin
|
c3705ccb25
|
Improve group collapse JS code [SCI-2994][SCI-3024]
|
2019-03-04 13:44:43 +01:00 |
|
Anton Ignatov
|
f636b5adff
|
Remove script from modal
|
2019-03-01 14:56:06 +01:00 |
|
Miha Mencin
|
a372ebf07d
|
Revert "Task info section improvements [SCI - 3058]"
|
2019-02-27 21:00:11 +01:00 |
|
Oleksii Kriuchykhin
|
0930277c4e
|
Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]
|
2019-02-27 16:02:53 +01:00 |
|
Urban Rotnik
|
3121bf1d39
|
Update tooltip for system notifications dropdown
|
2019-02-27 14:49:18 +01:00 |
|
Anton Ignatov
|
a4cabb203b
|
Task info section improvements
|
2019-02-25 16:55:09 +01:00 |
|
Miha Mencin
|
76c3db0b11
|
added layout, added css, added select2 lib, WIP
|
2019-02-25 16:50:38 +01:00 |
|
aignatov-bio
|
aa8a2b040a
|
Merge pull request #1518 from biosistemika/features/system-notifications
Notification changes on settings page [SCI 3084] (#1517)
|
2019-02-22 14:01:38 +01:00 |
|
aignatov-bio
|
606708987f
|
Notification changes on settings page [SCI 3084] (#1517)
* Fix css and update text settings
|
2019-02-22 13:20:51 +01:00 |
|
Jure Grabnar
|
fb533eb9d3
|
Merge pull request #1507 from jbargu/jg_sci_2930_navigation_changed
Add action_name to sidebar cache as dependency [SCI-2930]
|
2019-02-22 10:04:57 +01:00 |
|
Miha Mencin
|
bcd0b433b6
|
Merge pull request #1514 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-21 16:38:58 +01:00 |
|
aignatov-bio
|
5f78d83f9c
|
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513)
* fix dropdown apperance
* Remove search and fix duplicate bug
* Fix specs for new method
|
2019-02-21 16:15:13 +01:00 |
|
Jure Grabnar
|
0fa06ea9fc
|
Merge pull request #1505 from jbargu/jg_sci_2928_few_turbolinks_bugs
Check for recaptcha enabled boolean value
|
2019-02-20 18:29:40 +01:00 |
|
aignatov-bio
|
5fdba554d2
|
Merge pull request #1510 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-20 17:22:57 +01:00 |
|
Jure Grabnar
|
61f9df0656
|
Add action_name to sidebar cache as dependency
Closes SCI-2930.
|
2019-02-20 14:13:51 +01:00 |
|
aignatov-bio
|
35268252c8
|
After reading What’s new notification and reloading the page, gift status is unseen again [SCI 3051] (#1504)
* Change relative path to absolute to mark_as_read and make clickable whole system notification with hover effecr
|
2019-02-20 13:15:16 +01:00 |
|
Jure Grabnar
|
e392f9e61f
|
Check for recaptcha enabled boolean value
Closes SCI-2928.
|
2019-02-20 10:14:37 +01:00 |
|
aignatov-bio
|
fcdb4e7a92
|
Merge pull request #1500 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-19 13:51:18 +01:00 |
|
Urban Rotnik
|
29d77ca81d
|
Add system_notification sending email feature
|
2019-02-19 11:20:25 +01:00 |
|
aignatov-bio
|
8e905b67b2
|
System notification navbar menu drop down [SCI 2955] (#1498)
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
|
2019-02-19 11:08:59 +01:00 |
|
aignatov-bio
|
c598541e09
|
System notification modal window [SCI-2957 and SCI-2958] (#1484)
* Added new system notification modal
* Adding loading system notification on sign in
|
2019-02-15 13:07:29 +01:00 |
|
aignatov-bio
|
5c85595ab4
|
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482)
* System notification view and notification partial (SCI 2956 and SCI 3001)
|
2019-02-13 13:06:14 +01:00 |
|
mlorb
|
8bad68c854
|
Merge pull request #1457 from mlorb/ml-sci-2933
Change experiment cards look and feel [SCI-2933]
|
2019-02-12 11:49:24 +01:00 |
|
Anton Ignatov
|
c6ab6da381
|
Fixed counter bug SCI-3005
|
2019-02-07 14:23:37 +01:00 |
|
Matej Zrimšek
|
ac78c7d21b
|
Process Handsontable formulas in project HTML files in team export [SCI-2918]
|
2019-01-31 07:39:17 +01:00 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +01:00 |
|
Miha Mencin
|
b67cee2e65
|
Merge pull request #1462 from biosistemika/SCI-2928-turbolinks-bug
SCI-2928 moving team modal js file to application.js.erb in order to …
|
2019-01-25 11:54:14 +01:00 |
|
Urban Rotnik
|
16e9a56874
|
Add recaptcha to invitation modal
SCI-2935
|
2019-01-25 11:27:01 +01:00 |
|
mlorb
|
a297ef2094
|
Merge pull request #1443 from mlorb/ml-sci-2914
Allow org. administrators to invite them onto all projects [SCI-2914]
|
2019-01-24 16:24:57 +01:00 |
|
mz3944
|
79d35de794
|
Merge pull request #1435 from mz3944/mz-SCI-2912
An error at archiving experiment with locked task [SCI-2912]
|
2019-01-24 05:27:58 +01:00 |
|
Miha Mencin
|
126a031498
|
SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded
|
2019-01-23 15:30:23 +01:00 |
|
mz3944
|
f6c8af105d
|
Merge pull request #1434 from mz3944/mz-SCI-2903
Fix (unite) Date and Time display formats [SCI-2903]
|
2019-01-21 09:50:34 +01:00 |
|
Urban Rotnik
|
686f10cbd0
|
Refactor instance method 'ordered_modules' to scope
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
1b70f42817
|
Refactor 'Experiment.modules_without_group' to Module's scope
|
2019-01-18 16:54:00 +01:00 |
|
mlorb
|
7fdef4d3ec
|
Change experiment cards look and feel
|
2019-01-18 15:57:44 +01:00 |
|
Oleksii Kriuchykhin
|
1861f86b2c
|
Improve export all modal messages in case of unlimited exports [SCI-2965]
|
2019-01-17 17:27:32 +01:00 |
|
Oleksii Kriuchykhin
|
e62e1873b0
|
Fix issue with caching in inventories dropdown [SCI-2776]
|
2019-01-17 15:04:20 +01:00 |
|
Miha Mencin
|
0766ee96a7
|
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-16 12:44:50 +01:00 |
|
Oleksii Kriuchykhin
|
3a4b992f4e
|
Code style fixies []SCI-2875]
|
2019-01-14 16:31:23 +01:00 |
|
Matej Zrimšek
|
838455af0d
|
Fix protocols.io Date handling at import
|
2019-01-12 19:28:45 +01:00 |
|
Oleksii Kriuchykhin
|
89240659a7
|
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-11 17:20:39 +01:00 |
|
Alex Kriuchykhin
|
b530cea771
|
Merge pull request #1438 from okriuchykhin/ok_SCI_2776
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-11 16:27:22 +01:00 |
|
Alex Kriuchykhin
|
be514fd62d
|
Merge pull request #1445 from okriuchykhin/ok_SCI_2931
Fix image URLs in export all document [SCI-2931]
|
2019-01-11 12:03:06 +01:00 |
|
Oleksii Kriuchykhin
|
132f46b136
|
Improve error handling in task inventories dropdown [SCI-2776]
|
2019-01-10 21:11:20 +01:00 |
|
Oleksii Kriuchykhin
|
ec28db6f4f
|
Fix image URLs in export all document [SCI-2931]
|
2019-01-10 14:19:40 +01:00 |
|
Alex Kriuchykhin
|
8ea37c541b
|
Merge pull request #1436 from okriuchykhin/ok_SCI_2904
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2019-01-10 11:04:26 +01:00 |
|
mlorb
|
06b1e5cf20
|
Allow org. administrators to invite them onto all projects
|
2019-01-08 16:30:52 +01:00 |
|
Matej Zrimšek
|
b64df7d8cc
|
Fix additional Date and Time display formats
|
2019-01-08 06:29:37 +01:00 |
|
Alex Kriuchykhin
|
8ffe5dafee
|
Merge pull request #1437 from okriuchykhin/ok_SCI_2907
Change sample date in date format settings [SCI-2907]
|
2019-01-03 16:10:19 +01:00 |
|
Oleksii Kriuchykhin
|
5ea5b76d39
|
Change sample date in date format settings [SCI-2907]
|
2019-01-03 14:15:41 +01:00 |
|
Oleksii Kriuchykhin
|
534866467b
|
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-03 14:11:00 +01:00 |
|
Oleksii Kriuchykhin
|
2769add4d9
|
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2018-12-31 18:10:12 +01:00 |
|
Matej Zrimšek
|
c84457e1ed
|
Prevent archiving of experiments with at least one locked task
|
2018-12-23 21:17:51 +01:00 |
|
Luka Murn
|
ac5c809d20
|
Add force_encoding to export all report view template
|
2018-12-18 21:03:10 +01:00 |
|
Luka Murn
|
097e871228
|
Fix assets include in export all report to work on production env
Closes SCI-2902.
|
2018-12-18 09:10:55 +01:00 |
|
mlorb
|
37f1d66268
|
Merge pull request #1421 from mlorb/ml-sci-2800-v2
Fix tooltip style [SCI-2800]
|
2018-12-17 11:25:31 +01:00 |
|
Alex Kriuchykhin
|
94e6143ac0
|
Merge pull request #1425 from okriuchykhin/ok_SCI_2907
Use fixed date example in date format drop down [SCI-2907]
|
2018-12-16 20:11:58 +01:00 |
|
Alex Kriuchykhin
|
8a348b8504
|
Merge pull request #1422 from okriuchykhin/ok_SCI_2910
Improve rendering speed of inventory table [SCI-2910]
|
2018-12-16 19:45:29 +01:00 |
|
Alex Kriuchykhin
|
abdf64a8c7
|
Merge pull request #1420 from okriuchykhin/ok_SCI_2894
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
|
2018-12-16 19:44:50 +01:00 |
|
Oleksii Kriuchykhin
|
23f8602872
|
Use fixed date example in date format dropdown [SCI-2907]
|
2018-12-13 17:53:04 +01:00 |
|
Oleksii Kriuchykhin
|
d5c07fd22a
|
Improve rendering speed of inventory table [SCI-2910]
|
2018-12-13 16:17:22 +01:00 |
|
Luka Murn
|
022d0d9512
|
Merge pull request #1419 from Ducz0r/lm-sci-2902-fix
Change export all to use HTML instead of PDF [SCI-2902]
|
2018-12-13 15:19:37 +01:00 |
|
mlorb
|
b7efce579b
|
fix tooltip style
|
2018-12-13 12:43:12 +01:00 |
|
Oleksii Kriuchykhin
|
311189a2e9
|
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
|
2018-12-13 11:18:09 +01:00 |
|
mlorb
|
cfd5156c09
|
Merge pull request #1416 from mlorb/ml-sci-2871
Fix behavior when user has no teams [SCI-2871]
|
2018-12-12 11:27:28 +01:00 |
|
mlorb
|
8170e1b367
|
Merge pull request #1414 from mlorb/ml-sci-2899
Fix invited member is added multiple times to team [SCI-2899]
|
2018-12-12 11:26:41 +01:00 |
|
Luka Murn
|
65adc7a556
|
Fix 2 minor visual bugs in reports
|
2018-12-12 11:15:32 +01:00 |
|
Luka Murn
|
24af108e98
|
Change PDF in export all to HTML
|
2018-12-12 11:15:16 +01:00 |
|
mlorb
|
4040b31143
|
Fix behavior when user has no teams
|
2018-12-10 15:42:05 +01:00 |
|
Alex Kriuchykhin
|
37db41e18e
|
Merge pull request #1405 from okriuchykhin/ok_SCI_2881
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-12-10 14:11:34 +01:00 |
|
Alex Kriuchykhin
|
51ba74cbab
|
Merge pull request #1403 from okriuchykhin/ok_SCI_2757
Enable caching for navigation sidebar [SCI-2757]
|
2018-12-10 14:11:05 +01:00 |
|
mlorb
|
d761a81b26
|
fix download link in email again
|
2018-12-07 15:02:45 +01:00 |
|
mlorb
|
d37f3a3c09
|
fix invited member is added multiple times to team
|
2018-12-07 11:36:26 +01:00 |
|
mlorb
|
5dee804006
|
fix download exported project from email link
|
2018-12-06 09:42:58 +01:00 |
|
Oleksii Kriuchykhin
|
d2b1fd8ef2
|
Remove unneeded check [SCI-2757]
|
2018-12-03 13:03:22 +01:00 |
|
Oleksii Kriuchykhin
|
e43b366cdb
|
Disable fragment caching
|
2018-11-29 18:07:31 +01:00 |
|
Oleksii Kriuchykhin
|
2c96f08b98
|
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-11-29 14:20:20 +01:00 |
|
Oleksii Kriuchykhin
|
60a19734b2
|
Enable caching for navigation sidebar [SCI-2757]
|
2018-11-29 11:28:36 +01:00 |
|
Alex Kriuchykhin
|
20e2cbf0ca
|
Merge pull request #1391 from okriuchykhin/ok_SCI_2880
Fix smart annotations rendering issues [SCI-2880]
|
2018-11-28 09:47:20 +01:00 |
|
mlorb
|
398c2f0576
|
Merge pull request #1392 from mlorb/ml-sci-2676
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]
|
2018-11-27 11:06:45 +01:00 |
|
Alex Kriuchykhin
|
d475197e65
|
Merge pull request #1396 from okriuchykhin/ok_SCI_2882
Fix handsontable initialization [SCI-2882]
|
2018-11-26 15:19:23 +01:00 |
|
Jure Grabnar
|
7812f70c2f
|
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix
Protocols - import from protocols.io doesn't work
|
2018-11-26 14:56:25 +01:00 |
|
mlorb
|
18d9ab5888
|
fixes upon @Ducz0r request
|
2018-11-26 14:23:26 +01:00 |
|
Oleksii Kriuchykhin
|
2e00f1546a
|
Fix handsontable initialization [SCI-2882]
|
2018-11-26 14:11:46 +01:00 |
|
Jure Grabnar
|
0086e4dcf3
|
Catch some of templates error when import protocols.io
|
2018-11-26 13:43:05 +01:00 |
|
Luka Murn
|
eb2bf184b2
|
Merge pull request #1394 from Ducz0r/lm-sci-2884-fix
Update export email's look & feel [SCI-2884]
|
2018-11-26 11:50:31 +01:00 |
|
Jure Grabnar
|
1c7a051551
|
Catch all errors on PIO import and show message
|
2018-11-23 20:47:48 +01:00 |
|
Jure Grabnar
|
2834edb286
|
Add command/subprotocol/safety for PIO
|
2018-11-23 20:13:34 +01:00 |
|
Jure Grabnar
|
c00b08b101
|
Add sw_package and dataset component for PIO
|
2018-11-23 19:44:10 +01:00 |
|
Jure Grabnar
|
2c8a7f8eca
|
Add last_modified evaluation for PIO import
|
2018-11-23 17:51:47 +01:00 |
|
Jure Grabnar
|
87d5e5029a
|
Fix publish_date in PIO import
|
2018-11-23 17:37:26 +01:00 |
|
Luka Murn
|
87ff7c71e3
|
Update the delivery email look & feel
Closes SCI-2884.
|
2018-11-23 17:24:10 +01:00 |
|
Jure Grabnar
|
76c2da4bae
|
Add uniq tables
|
2018-11-23 16:30:29 +01:00 |
|
mlorb
|
f61187dd18
|
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows
|
2018-11-23 15:44:04 +01:00 |
|
Oleksii Kriuchykhin
|
b926cadba4
|
Fix smartannotations rendering issues [SCI-2880]
|
2018-11-23 15:07:08 +01:00 |
|
Luka Murn
|
af307eae73
|
Move some text into localization file
|
2018-11-23 11:12:10 +01:00 |
|
Luka Murn
|
d071454fc8
|
Remove byebug from HTML template
Closes SCI-2883.
|
2018-11-23 10:31:41 +01:00 |
|
Alex Kriuchykhin
|
95e19e1229
|
Merge pull request #1381 from okriuchykhin/ok_SCI_2859
Refactor & restyle the API authorization screen [SCI-2859]
|
2018-11-22 13:06:13 +01:00 |
|
mlorb
|
4ace5bf49f
|
Merge pull request #1384 from mlorb/ml-sci-2846
Fix teams switch not working at navigating from task [SCI-2846]
|
2018-11-22 10:48:33 +01:00 |
|
mlorb
|
8bf1056bf5
|
fix teams switch not working at navigating from task
|
2018-11-21 10:12:21 +01:00 |
|
mz3944
|
6b996fc000
|
Merge pull request #1362 from mz3944/mz-SCI-2817
Export - various small changes/fixes [SCI-2817]
|
2018-11-20 21:32:47 +01:00 |
|
mz3944
|
4d460d14ea
|
Merge pull request #1378 from mz3944/mz-SCI-2861
All users in smart annotation have removed in brackets [SCI-2861]
|
2018-11-20 21:22:23 +01:00 |
|
Oleksii Kriuchykhin
|
d98f11abdc
|
Refactor & restyle the API authorization screen [SCI-2859]
|
2018-11-20 17:02:45 +01:00 |
|
Alex Kriuchykhin
|
a6bc02a2cb
|
Merge pull request #1369 from okriuchykhin/ok_SCI_2830
Refactor result and step comments [SCI-2830]
|
2018-11-20 00:13:15 +01:00 |
|
mlorb
|
3b96a60938
|
Merge pull request #1374 from mlorb/ml-sci-2842
Update the Export all confirmation modal and export interaction [SCI-2842]
|
2018-11-19 11:36:08 +01:00 |
|
Alex Kriuchykhin
|
d524a1d508
|
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
Add time format selection to settings [SCI-2778]
|
2018-11-19 10:17:09 +01:00 |
|
Matej Zrimšek
|
c144d599fc
|
Fix user smart annotation showing as if the user is removed from team [SCI-2861]
|
2018-11-19 08:02:25 +01:00 |
|
mlorb
|
4b540958bd
|
change close/cancel button and refactor export_project_modal endpoint
|
2018-11-16 13:37:32 +01:00 |
|
mlorb
|
6453ab6fb1
|
update the Export all confirmation modal and export interaction
|
2018-11-15 15:53:58 +01:00 |
|
Luka Murn
|
e9c0b34662
|
Merge branch 'core-api' into 'master'
Conflicts:
Gemfile
app/services/api.rb
config/initializers/api.rb
config/initializers/extends.rb
config/routes.rb
db/schema.rb
spec/controllers/api/api_controller_spec.rb
|
2018-11-14 16:59:04 +01:00 |
|
Alex Kriuchykhin
|
324069c071
|
Merge pull request #1370 from okriuchykhin/ok_SCI_2853
Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]
|
2018-11-14 13:51:43 +01:00 |
|
Oleksii Kriuchykhin
|
3fd687161f
|
Remove unused variables from activities controller [SCI-2778]
|
2018-11-14 13:17:38 +01:00 |
|
Oleksii Kriuchykhin
|
537de596a7
|
Merge latest master [SCI-2778]
|
2018-11-14 13:05:57 +01:00 |
|
Oleksii Kriuchykhin
|
c44109958a
|
Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]
|
2018-11-14 12:56:04 +01:00 |
|
Oleksii Kriuchykhin
|
380a96dcce
|
Add caching for step and result fragments [SCI-2830]
|
2018-11-14 11:57:53 +01:00 |
|
Luka Murn
|
98a39ecd72
|
Fix visual bug (everything bold) on projects index page
Bug was introduced in projects absent section, there was no
closing </strong> tag.
|
2018-11-14 11:33:27 +01:00 |
|
Oleksii Kriuchykhin
|
fb309a12b9
|
Refactor result and step comments initialization [SCI-2830]
|
2018-11-13 16:57:42 +01:00 |
|
Luka Murn
|
84df2c81f9
|
Merge branch 'features/export-all'
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
|
2018-11-13 09:14:02 +01:00 |
|
Oleksii Kriuchykhin
|
98d1ea8542
|
Improve Export All button behaviour [SCI-2839]
|
2018-11-12 15:51:03 +01:00 |
|
Oleksii Kriuchykhin
|
e89d60785f
|
Fix dates on activities and experiments [SCI-2778]
|
2018-11-12 10:26:48 +01:00 |
|
Matej Zrimšek
|
57dbd63aa3
|
Add archive badge for archived projetcs/experiments/modules in export-all PDF [SCI-2817]
|
2018-11-12 01:34:00 +01:00 |
|
Oleksii Kriuchykhin
|
8d0dbc7076
|
Add time format selection to settings [SCI-2778]
|
2018-11-09 16:19:40 +01:00 |
|
mlorb
|
4d156080ac
|
fix empty projects page bug and projects tree bug
|
2018-11-07 13:45:46 +01:00 |
|
mlorb
|
63e039e235
|
fix bug with new project button not working
|
2018-11-06 11:38:31 +01:00 |
|
Alex Kriuchykhin
|
c1d853f7bd
|
Merge pull request #1344 from okriuchykhin/ok_SCI_2783
Fix issue with project dropdown caching [SCI-2783]
|
2018-10-29 10:56:02 +01:00 |
|