Martin Artnik
403bce6f5f
Fixed creating notifications when users are inactive [SCI-5938]
2021-08-18 10:45:29 +02:00
Martin Artnik
a82af505eb
Merge branch 'develop' into features/webhooks
2021-08-02 16:22:52 +02:00
Martin Artnik
67f4e81a3a
Merge branch 'develop' into features/new_permissions
2021-07-28 15:16:47 +02:00
Alex Kriuchykhin
dfa2a7775d
Merge pull request #3422 from okriuchykhin/ok_SCI_5847
...
Fix repository cell joining and preloading [SCI-5847]
2021-07-21 13:18:21 +02:00
artoscinote
5f9c04844f
Added prefixed IDs to repository rows (items) [SCI-5909] ( #3441 )
...
* Added prefixed IDs to repository rows (items) [SCI-5909]
* Fix prefixed id queries to work with joins, use subquery in repository search [SCI-5909]
* Fixed accessing repository_row parent code [SCI-5909]
* Better handling of repository_row code display [SCI-5909]
* Fix index warning for id prefixed models issue setting up project [SCI-5909]
2021-07-19 14:23:36 +02:00
Oleksii Kriuchykhin
549fc8e5a0
Fix repository cell joining and preloading [SCI-5847]
2021-07-07 17:43:51 +02:00
Oleksii Kriuchykhin
d1208bad0b
Merge branch 'develop' into features/new_permissions
2021-07-07 13:44:36 +02:00
aignatov-bio
d0b4a75095
Fix file icons in report
2021-06-30 14:35:23 +02:00
Oleksii Kriuchykhin
7d31b99386
Revert to fontawesome CDN link in reports and update wicked_pdf [SCI-5650]
2021-06-18 15:03:17 +02:00
Oleksii Kriuchykhin
bb458abec6
Remove old reports code [SCI-5650]
2021-06-18 10:40:00 +02:00
Oleksii Kriuchykhin
c03535f027
Code style improvements [SCI-5831]
2021-06-18 10:33:31 +02:00
Oleksii Kriuchykhin
1e3197875c
Fix repositories selection in report wizard and deleted repositories handling [SCI-5831]
2021-06-17 16:23:27 +02:00
Oleksii Kriuchykhin
85a5cca98a
Fix repository snapshots for export all [SCI-5776]
2021-06-16 16:17:12 +02:00
Oleksii Kriuchykhin
16bad9eb9c
Fix export all functionality [SCI-5776]
2021-06-08 14:21:34 +02:00
zmagoD
784e43e328
create user_assignments for all child objects when the user is attached to the project
2021-06-06 09:54:47 +02:00
aignatov-bio
9559ed88aa
Add webhooks index page [SCI-5766] ( #3366 )
2021-06-03 14:00:43 +02:00
zmagoD
28cb7ee81d
add user roles enpoint and update scenarios
2021-05-29 15:28:10 +02:00
Oleksii Kriuchykhin
70f0535dbd
Fix deletion of old reports [SCI-5751]
2021-05-27 16:31:58 +02:00
zmagoD
7e6789200a
fix new API endpoints and add test cases
2021-05-23 17:31:02 +02:00
zmagoD
be94cb09c2
fix code style
2021-05-22 14:41:56 +02:00
Oleksii Kriuchykhin
29c83ffbb1
Merge branch 'develop' into features/new-reports
2021-05-21 11:04:17 +02:00
zmagoD
c23c01c01c
remove user projects enpoints, fix the role name display
2021-05-16 12:03:16 +02:00
zmagoD
de4c28069a
fix experiment level styling issues and update the dropdown placeholerds
2021-05-16 11:04:04 +02:00
zmagoD
5ee38966a0
Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui
2021-05-11 08:36:39 +02:00
zmagoD
8f9c55d6e4
update locales
2021-05-11 08:30:39 +02:00
zmagoD
d145dd6d36
add my module assigments modals
2021-05-09 16:59:10 +02:00
zmagoD
ac91d9c2c4
add assign user permission to experiment level
2021-05-08 18:06:07 +02:00
Alex Kriuchykhin
eb773d94c5
Merge pull request #3294 from okriuchykhin/ok_SCI_5619
...
Add default settings to existing reports [SCI-5619][SCI-5672]
2021-05-07 11:38:41 +02:00
Oleksii Kriuchykhin
b67f2a21f5
Add default settings to existing reports [SCI-5619][SCI-5672]
2021-05-06 17:33:58 +02:00
Oleksii Kriuchykhin
6a1c073024
Fix file icons in export all [SCI-5685]
2021-05-06 14:53:44 +02:00
aignatov-bio
bb5f985630
Add new activities to reports [SCI-5638]
2021-05-06 14:03:45 +02:00
aignatov-bio
9ca7b76a1f
Fix report assigned repository items
2021-05-04 12:49:38 +02:00
zmagoD
11e5662c47
add fe logic for disable/enable fields
2021-04-30 13:26:06 +02:00
zmagoD
8a74546cdf
fix the logic for addin/editing new project members
2021-04-28 18:02:18 +02:00
Oleksii Kriuchykhin
bca88188de
Limit created report relations depth to tasks [SCI-5665]
2021-04-28 15:33:30 +02:00
Oleksii Kriuchykhin
8a915c8acf
Fix assets inclusion into report [SCI-5680]
2021-04-28 14:37:16 +02:00
zmagoD
c136d953d0
create form object for role assigment, create helper object for project member, added new user_projects modal
2021-04-24 18:43:28 +02:00
Oleksii Kriuchykhin
a67cc619ec
Add additional custom fields for reports [SCI-5609]
2021-04-20 13:57:09 +02:00
zmagoD
04ef7a4478
add show and edit permissions modal
2021-04-18 17:19:16 +02:00
Miha Mencin
d5c8edd266
Merge pull request #3223 from aignatov-bio/ai-sci-5513-fix-office-icons-in-print-report
...
Convert office icons to base64 [SCI-5513]
2021-03-24 09:44:54 +01:00
Oleksii Kriuchykhin
d315b1327b
Implement missing missing user smart annotation notifications [SCI-5575]
2021-03-19 17:11:19 +01:00
aignatov-bio
c1f0896670
Convert office icons to base64 [SCI-5513]
2021-03-19 15:10:23 +01:00
Urban Rotnik
8202181095
Merge pull request #3186 from urbanrotnik/ur-sci-4140-fix-notifications
...
Bring back old notifications [SCI-4140]
2021-03-09 14:54:08 +01:00
Urban Rotnik
ab1477997a
Update variables name
2021-03-09 14:50:14 +01:00
Urban Rotnik
e16612caee
Merge pull request #3205 from urbanrotnik/ur-sci-4084
...
Fix missing user placeholder icon in export_all [SCI-4084]
2021-03-09 13:21:00 +01:00
Urban Rotnik
b9f77bf4fd
Fix missing user placeholder icon in export_all
2021-03-08 14:39:58 +01:00
Urban Rotnik
e1db291729
Merge pull request #3200 from urbanrotnik/ur-sci-5525
...
Add breadcrumbs on Experiments and Tasks pages [SCI-5525]
2021-03-08 14:13:44 +01:00
aignatov-bio
4f1905d16a
Merge pull request #3204 from aignatov-bio/ai-sci-fix-new-step-creation
...
Fix new step creation
2021-03-08 12:24:27 +01:00
aignatov-bio
d99722be5c
Fix new step creation
2021-03-08 12:21:10 +01:00
Urban Rotnik
96ef0c10da
Merge pull request #3148 from urbanrotnik/ur-sci-5450-remamber-user-view-mode
...
Store Table/Cards view setting per user [SCI-5450]
2021-03-08 11:48:33 +01:00
Urban Rotnik
235f19cf25
Store Table/Cards view setting per user
...
SCI-5450
2021-03-04 14:56:59 +01:00
Urban Rotnik
401224ae11
Add breadcrumbs on Experiments and Tasks pages
2021-03-04 09:00:58 +01:00
aignatov-bio
468afaaa5a
Fix upercase file extensions [SCI-5484]
2021-03-02 15:04:43 +01:00
Urban Rotnik
1bb2393655
Use translations
...
SCI-4140
2021-02-25 11:59:26 +01:00
Urban Rotnik
347f208480
Bring back old notifications
...
SCI-4140
2021-02-25 11:59:14 +01:00
Oleksii Kriuchykhin
7d89088b14
Multiple small bugfixes [SCI-5494]
2021-02-18 13:55:03 +01:00
aignatov-bio
1eff3494fb
Fix archived experiments page routes and clean old archive page [SCI-5479]
2021-02-11 14:21:15 +01:00
Miha Mencin
b35e15fdd5
Merge pull request #3101 from aignatov-bio/ai-sci-5263-add-new-file-icons-to-report
...
Add new asset icons to report [SCI-5263]
2021-02-05 08:21:05 +01:00
aignatov-bio
a7a948abaf
Add archive/restore toolbar buttons and backend [SCI-5457]
2021-02-03 14:29:50 +01:00
Urban Rotnik
ebbbfa657c
Fix folders activities [SCI-5402] [SCI-5403] ( #3112 )
...
* Fix activities and make folders clickable
* Remove archive project activity and action
* Save nil value for root folder
* Add empty values to hash
2021-01-22 11:24:08 +01:00
Alex Kriuchykhin
adb9442677
Small bugfixes [SCI-5432] ( #3107 )
2021-01-21 11:24:25 +01:00
Alex Kriuchykhin
8ab7b94443
Fix error message at login with false credential [SCI-5412] ( #3102 )
2021-01-19 17:19:40 +01:00
aignatov-bio
07831c0294
Add new asset icons to report [SCI-5263]
2021-01-19 12:53:49 +01:00
Alex Kriuchykhin
f15d984d47
Fix navigation between archived and active projects [SCI-5419] ( #3100 )
...
* Fix navigation between archived and active projects [SCI-5419]
2021-01-19 11:28:59 +01:00
Urban Rotnik
496c106497
Merge pull request #3088 from urbanrotnik/ur-sci-5395-breadcrumbs-order
2021-01-15 17:04:31 +01:00
Urban Rotnik
97371f8216
Reorder ProjectFolder inner foldres
2021-01-15 14:22:48 +01:00
Urban Rotnik
531b6cd554
Fix folder's activities links
2021-01-14 15:06:56 +01:00
Alex Kriuchykhin
62b1aaf033
Merge pull request #3077 from okriuchykhin/ok_SCI_5386
...
Fix flash messages on sign-in [SCI-5386]
2021-01-12 15:44:24 +01:00
Urban Rotnik
1070e813fc
Add helper for archived_on date
2021-01-12 15:35:35 +01:00
Oleksii Kriuchykhin
cf3b0916f6
Fix flash messages on sign-in [SCI-5386]
2021-01-12 15:28:30 +01:00
Oleksii Kriuchykhin
78ec862a2c
Fix folder creation for archived view [SCI-5383]
2021-01-12 13:06:43 +01:00
aignatov-bio
e88848cd75
Fix comments counter [SCI-5371] ( #3063 )
2021-01-11 10:03:13 +01:00
Urban Rotnik
3a52f62d85
Implement folders tree for move action
2021-01-07 17:42:01 +01:00
aignatov-bio
1f6fff812a
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] ( #3048 )
...
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
2021-01-07 13:16:05 +01:00
Urban Rotnik
8f11376285
Merge pull request #3045 from urbanrotnik/ur-sci-5320-tooptip-for-avatars
...
Tooltip for users on project cards [SCI-5320]
2021-01-06 09:18:00 +01:00
Mojca Lorber
2ebd78676f
Move sanitize_input
2021-01-06 09:14:43 +01:00
Mojca Lorber
283bfc8759
Update css for users on project cards
2021-01-05 18:31:33 +01:00
Oleksii Kriuchykhin
f43340a849
Fix projects visibility in the sidebar [SCI-5338]
2021-01-05 13:50:42 +01:00
Alex Kriuchykhin
a8991356b5
Merge pull request #3033 from okriuchykhin/ok_SCI_5341
...
Fix restore action for experiments and tasks [SCI-5341]
2021-01-05 10:09:39 +01:00
Oleksii Kriuchykhin
58cce0f153
Improve task restoring and refactor flash messages [SCI-5341]
2021-01-04 17:00:23 +01:00
Urban Rotnik
cd43973952
Add tooltips for users on project cards
2021-01-04 16:44:31 +01:00
Alex Kriuchykhin
163a2d1e60
Merge pull request #3042 from okriuchykhin/ok_SCI_5340
...
Make active projects view default [SCI-5340]
2021-01-04 11:56:22 +01:00
Alex Kriuchykhin
4638e74e1e
Merge pull request #3041 from okriuchykhin/ok_SCI_5327
...
Fix links in sidebar navigation [SCI-5327]
2021-01-04 10:53:38 +01:00
Oleksii Kriuchykhin
ffd9132b52
Make active projects view default [SCI-5340]
2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin
8f0a3fb61c
Fix links in sidebar navigation [SCI-5327]
2020-12-30 22:49:02 +01:00
Oleksii Kriuchykhin
738f668ba9
Disable comment adding for archived objects [SCI-5339]
2020-12-30 11:46:56 +01:00
Oleksii Kriuchykhin
67b3f853d7
Merge branch 'develop' into features/folders
2020-12-18 14:51:21 +01:00
Urban Rotnik
d3e38c89f8
Update BE sorting for archived fodlers&projects
...
SCI-5306
2020-12-18 11:27:17 +01:00
Urban Rotnik
7c0ad021de
Update sorting dropdown
2020-12-18 11:08:38 +01:00
Urban Rotnik
87ca79717c
Add separate sorting for active/archived view
...
[SCI-5306]
2020-12-18 08:41:51 +01:00
Miha Mencin
f284ef1592
Merge pull request #3009 from okriuchykhin/ok_SCI_5276
...
Archiving: update archived TASK screen layout [SCI-5276]
2020-12-17 13:46:35 +01:00
Oleksii Kriuchykhin
7bb334e737
Archiving: update archived TASK screen layout [SCI-5276]
2020-12-17 13:26:44 +01:00
Miha Mencin
ea9f3dcada
Merge pull request #2996 from okriuchykhin/ok_SCI_5253
...
Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]
2020-12-17 09:17:44 +01:00
aignatov-bio
6a44e23697
Add projects sidebar [SCI-5178] ( #2995 )
...
* Add projects sidebar navigation [SCI-5178]
2020-12-08 16:07:26 +01:00
Oleksii Kriuchykhin
62374bee0a
Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]
2020-12-07 11:04:33 +01:00
Urban Rotnik
7773afbcdb
Add activities for Project Folders [SCI-5181]
2020-12-04 12:03:49 +01:00
mlorb
9693f84bbd
Implement actions dropdown on project card [SCI-5132] [SCI-5179] ( #2968 )
...
* Implement actions dropdown on project card
* make comments counter to work
2020-12-04 09:38:34 +01:00
aignatov-bio
48184df312
Merge pull request #2985 from aignatov-bio/ai-sci-5250-add-preview-to-export-all
...
Add preview files to export all [SCI-5250]
2020-11-30 12:21:43 +01:00
aignatov-bio
8cdf09f244
Add preview files to export all
2020-11-27 11:07:37 +01:00
aignatov-bio
d162fb6d35
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete
...
Add delete asset confirmation modal [SCI-5241]
2020-11-26 15:35:40 +01:00
aignatov-bio
3078e60867
Small css fixes
2020-11-25 16:25:17 +01:00
aignatov-bio
1979883004
Add delete asset confirmation modal
2020-11-25 12:50:34 +01:00
aignatov-bio
f2ca55dbf8
Add new icons for assets
2020-11-24 15:37:45 +01:00
aignatov-bio
60ce51149d
Add CRUD to comments
2020-11-20 20:25:28 +01:00
aignatov-bio
12fdea8d89
Add context menu to attahcments
2020-11-04 13:08:40 +01:00
aignatov-bio
f85a3493cd
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports
...
Add filer previews to reports [SCI-5110]
2020-11-02 18:48:45 +01:00
Urban Rotnik
bb5c703696
Merge pull request #2878 from urbanrotnik/ur-sci-5040
...
Support multiple file upload in TinyMCE fields [SCI-5040]
2020-10-29 14:14:38 +01:00
aignatov-bio
2f1217688c
Add filer previews to reports
2020-10-28 16:32:22 +01:00
Miha Mencin
235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2
...
Release/1.20.2
2020-10-28 13:58:25 +01:00
Urban Rotnik
aa1520bfb8
Merge branch 'develop' into jg_sci_2228
2020-10-22 14:21:39 +02:00
Mojca Lorber
6d7b55301f
Fix pwa url and change when banner is displayed
2020-10-21 14:56:20 +02:00
Mojca Lorber
23f01ac6a9
Add 'Open in APP' button to the task
2020-10-19 12:17:03 +02:00
Oleksii Kriuchykhin
6c367428a1
Fix team switcher [SCI-5080]
2020-10-02 14:25:44 +02:00
Urban Rotnik
fc8704b520
Add fileUtils for sizeCheck, add url to textarea data attribute
2020-09-30 13:20:11 +02:00
aignatov-bio
16fe11f0f7
Fix smitch team on link for object from other team
2020-09-28 17:16:18 +02:00
aignatov-bio
e5d3fac112
Merge branch 'features/smart-annotation-improvements' into develop
2020-09-17 14:52:51 +02:00
aignatov-bio
7a86bb47c5
Add styling and highligh
2020-09-09 14:17:19 +02:00
aignatov-bio
bd1d6a772b
Add completed/uncompleted methods to my_module
2020-09-08 09:45:09 +02:00
Urban Rotnik
a259800590
Merge branch 'develop' into jg_sci_2228
2020-08-31 16:29:23 +02:00
Urban Rotnik
5923a4c014
Merge branch 'develop' into features/task-flows
2020-08-25 15:30:22 +02:00
Oleksii Kriuchykhin
ce8d12e1c4
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-08-05 09:59:58 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows
2020-08-04 14:50:46 +02:00
aignatov-bio
a0d19b5d98
Add new statuses to reports
2020-07-23 14:24:30 +02:00
aignatov-bio
04a6a2a250
Small fixes
2020-07-23 11:35:22 +02:00
aignatov-bio
6ceb4abfb5
Add constant for results limit
2020-07-17 11:12:39 +02:00
aignatov-bio
7c4bfad09b
Add pagination to results page
2020-07-16 15:47:19 +02:00
aignatov-bio
39b5651283
Revert FontAwesome in reports to CDN
2020-07-14 09:44:03 +02:00
aignatov-bio
c73998b6bf
Fix markup
2020-07-13 16:32:28 +02:00
aignatov-bio
a7fac38fcb
Improve pdf reports
2020-07-13 14:29:59 +02:00
Oleksii Kriuchykhin
7efe5c32eb
Fix missing unshared and unassigned inventories with snapshots in reports [SCI-4845]
2020-07-09 15:38:38 +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
Urban Rotnik
33aa1d3641
Merge pull request #2709 from urbanrotnik/ur-sci-4804
...
Fix Repository rows count & table header adjustmen [SCI-4804]
2020-07-08 11:39:44 +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
Urban Rotnik
79ef4ece28
Fix repository rows count
2020-07-07 09:48:18 +02:00
Miha Mencin
6726a19cbe
Merge pull request #2695 from okriuchykhin/ok_SCI_4738
...
Add repository snapshots to export all [SCI-4738]
2020-07-02 15:18:47 +02:00
aignatov-bio
d226bb5622
Fix date columns sorting in repositories list
2020-07-02 14:35:48 +02:00
Oleksii Kriuchykhin
166a0ddd34
Improve code styling [SCI-4738]
2020-06-29 11:43:23 +02:00
Oleksii Kriuchykhin
7ea577d8d4
Merge branch 'features/inventory-archiving' into develop
2020-06-24 14:04:54 +02:00
Urban Rotnik
193375818e
Disable checkboxes for shared inventories
2020-06-24 13:41:00 +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
6f2d5b359e
Add action buttons to repository index
2020-06-19 15:54:45 +02:00
Urban Rotnik
b498aa54d3
Merge pull request #2661 from urbanrotnik/ur-sci-4740-default-scope
...
Update default scope [SCI-4740] [SCI-4687][SCI-4746]
2020-06-18 14:07:10 +02:00
Urban Rotnik
a05be67d3a
Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag
...
Add archived tags to assigned repository rows [SCI-4703]
2020-06-18 13:47:57 +02:00
Urban Rotnik
123375f494
Update scopes in reports
2020-06-18 09:33:12 +02:00
Oleksii Kriuchykhin
86b2eea383
Add repository snapshots to export all [SCI-4738]
2020-06-17 23:21:56 +02:00
Urban Rotnik
868c1c1fa0
Improve row state passing
2020-06-15 13:42:16 +02:00
aignatov-bio
db35da0cee
Add archiving column to datatable helper
2020-06-11 12:48:31 +02:00
Urban Rotnik
9bac0fb867
Add archived tags to assigned repository rows
2020-06-10 14:48:03 +02:00
aignatov-bio
2b9062ac92
Add checkbox selector to datatable
2020-06-09 13:16:50 +02:00
aignatov-bio
4a6d7d0e12
Add archived inventories
2020-06-04 19:07:10 +02:00
aignatov-bio
012b7b3d23
Add switch for active/archive repository view
2020-06-04 18:41:45 +02:00
Urban Rotnik
a93e2a5d6f
Remove select
2020-06-03 23:18:22 +02:00
Urban Rotnik
69d086ba32
Scope snapshots to project
2020-06-03 22:58:22 +02:00
Urban Rotnik
50bc313853
Fix for default snapshot in report
2020-06-03 10:49:45 +02:00
aignatov-bio
aee75a2f83
Add repository list view
2020-06-01 10:24:03 +02:00
Oleksii Kriuchykhin
d774a82762
Fix handling of snapshots of deleted repositories in reports [SCI-4698]
2020-05-29 16:30:27 +02:00
Oleksii Kriuchykhin
b430d507cf
Fix handling of deleted repositories in reports [SCI-4698]
2020-05-27 12:15:19 +02:00
Alex Kriuchykhin
8ed8f148a3
Revert "Fix handling of deleted repositories in reports [SCI-4698]"
2020-05-27 10:39:44 +02:00
Oleksii Kriuchykhin
6424bd23da
Fix handling of deleted repositories in reports [SCI-4698]
2020-05-27 08:21:55 +02:00
aignatov-bio
15f58be1c2
Fix snapshot date creation
2020-05-26 15:59:49 +02:00
Urban Rotnik
df8fe20d03
Keep reportElements up to date with active snapshots and repositories
2020-05-25 13:19:33 +02:00
aignatov-bio
cbc578f84b
Fix snapshot name column id
2020-05-22 15:10:21 +02:00
aignatov-bio
0aa1c32813
Fix ordering in simple table view
2020-05-21 16:51:07 +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
Oleksii Kriuchykhin
d77930af61
Fix failing tests for repository rows controller [SCI-4629]
2020-05-18 14:12:06 +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
Oleksii Kriuchykhin
c0521c3ca7
Prevent the inventory items editing while snapshot is being created [SCI-4629]
2020-05-15 17:46:59 +02:00
Urban Rotnik
a2ade6e0ec
Merge branch 'develop' into features/new-task-layout
2020-05-15 14:27:56 +02:00
aignatov-bio
bac98bdbdc
Remove inventory tab from task and routes to inventory page
2020-05-14 22:10:13 +02:00
Miha Mencin
2e4655f9ee
Merge pull request #2548 from urbanrotnik/ur-sci-4609-task-card-due-date
...
Task card due date fix [SCI-4609]
2020-05-14 11:52:44 +02:00
Oleksii Kriuchykhin
ea740eb2a4
Restore deleted method after rebase [SCI-4596]
2020-05-14 10:57:43 +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
Urban Rotnik
8174d63734
Include BoostrapFormHelper in FormBuilder
2020-05-08 20:36:45 +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
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
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
aignatov-bio
61bbca6bcf
Fix path names and markup
2020-04-28 19:12:17 +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
aignatov-bio
2f7adffcb0
Fix markup
2020-04-23 16:40:14 +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
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
Urban Rotnik
38c198705c
Change current_team to target team, add id param to link
2020-04-23 12:40:43 +02:00
Oleksii Kriuchykhin
e0d397ba77
Improve code style in repository_datatable_helper.rb [SCI-4525]
2020-04-22 15:21:04 +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
aignatov-bio
087f71a82f
Add full view for my-module repository
2020-04-07 21:02:16 +02:00
aignatov-bio
9dfc652580
Fix markup
2020-04-07 12:50:58 +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
Oleksii Kriuchykhin
3c53be1f9a
Add start date to the task [SCI-4504]
2020-03-31 14:17:14 +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
Oleksii Kriuchykhin
a518bfe023
Enable time fraction for task due date [SCI-4408]
2020-03-16 17:55:35 +01:00
aignatov-bio
8e05908753
Small fixes
2020-02-25 17:19:11 +01:00
aignatov-bio
5c0a769f87
General dashboard layout
2020-02-13 13:50:29 +01:00
aignatov-bio
44eccaaa12
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1
...
Fix small visual bugs [SCI-4254]
2020-01-30 13:42:07 +01:00
Urban Rotnik
fc14bf05be
Merge pull request #2377 from biosistemika/master
...
Master >> Develop
2020-01-29 14:25:11 +01:00
Urban Rotnik
503c05805d
Move editable? method from helper to model
2020-01-25 09:43:05 +01:00
Urban Rotnik
ec8af5f943
Add readonly repository rows records
2020-01-24 16:33:44 +01:00
aignatov-bio
9524659e1d
Demodulize column name in datatable helper
2020-01-24 11:33:30 +01:00
aignatov-bio
4395a7cc6b
Fix small visual bugs
2020-01-23 13:12:58 +01:00
Urban Rotnik
75c7cb7aa8
Keep circles for task page
2020-01-14 13:31:44 +01:00
Urban Rotnik
2468b67de0
Assign column update
2020-01-14 09:02:30 +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
aignatov-bio
d5675c0c33
Add smart annotations to repository text value
2020-01-10 12:56:57 +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
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
aignatov-bio
ef3814ccec
Add new buttons to protocols, tasks, experiments, projects
2020-01-06 10:40:20 +01:00
Oleksii Kriuchykhin
e24bc2775a
Add view/edit renderers for numeric data type [SCI-4166]
2019-12-18 11:55:12 +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
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
Urban Rotnik
06d87cb4b6
Add I18n to serializers
2019-12-06 11:39:10 +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
Urban Rotnik
5f2407e3fb
Add view renders for DateTime column types
2019-11-29 10:50:14 +01:00
Urban Rotnik
1c9d7ef6e7
Add File type renderer
2019-11-29 10:19:54 +01:00
Urban Rotnik
b2ce600820
Add delimiter column for repository_column
2019-11-29 10:19:10 +01:00
Oleksii Kriuchykhin
371f699a11
Fix AR preloading for repository table [SCI-4070]
2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin
3481b50796
Fix column reordering for repositories [SCI-4070]
2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin
220c3f8eeb
Fix repository columns default state [SCI-4070]
2019-11-29 10:19:05 +01:00
Oleksii Kriuchykhin
338b710d81
Refactor inventory edit mode [SCI-4070]
2019-11-29 10:19:05 +01:00
aignatov-bio
232e4d78be
Add serializers to datatable values
2019-11-29 10:19:03 +01:00
aignatov-bio
0f3c138a7e
Fix markup
2019-11-29 10:19:03 +01:00
aignatov-bio
a0f11116d2
Add render views for datatables
2019-11-29 10:18:59 +01:00
Mojca Lorber
467c80da52
Update basic modal layout for creating new column types
2019-11-29 10:16:47 +01:00
aignatov-bio
70d721bb99
Add text method for assets
2019-11-29 10:16:42 +01:00
aignatov-bio
2ed3054c89
Make repository value render more flexible
2019-11-29 10:16:42 +01:00
Oleksii Kriuchykhin
f5abb7c767
Add connected accounts section to settings [SCI-4106]
2019-11-27 23:16:25 +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
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
aignatov-bio
9950a23188
Replace base64 avatars with url
2019-10-22 12:27:13 +02:00
aignatov-bio
aaf76c0526
Fix avatars in comments and activities
2019-10-22 09:54:36 +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
Oleksii Kriuchykhin
3509543e7b
Merge branch 'master' into ok_SCI_3881
2019-09-16 11:56:49 +02:00
aignatov-bio
a3b2c7d5fe
Fix report image issues [SCI-3772] ( #1983 )
...
* Fix report image issues
* Small fixes
2019-09-12 09:02:45 +02:00
Mojca Lorber
e8f24b18e2
Fix missing icon on shared inventories in global search
2019-09-10 11:20:18 +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
Miha Mencin
a7bb7a1dd8
additional checking for icon: check also if user is guest
2019-08-26 11:20:18 +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
Mojca Lorber
530d09df64
add i-shared inventory icon
2019-08-19 15:43:55 +02:00
Oleksii Kriuchykhin
32054c5516
Handle situation for assets without blob in list sorting [SCI-3757]
2019-08-09 15:17:19 +02:00
Oleksii Kriuchykhin
c352a73d79
ActiveStorage fixies after latest master merge [SCI-3757]
2019-08-09 14:56:00 +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
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
aignatov-bio
6e5f078dea
Add activities for marvinJS [SCI-3630] ( #1950 )
...
* Add marvinJs activities to step and results
* Add activities for TinyMCE marvinJS assets
* Fix markup
2019-08-09 09:47:07 +02:00
Oleksii Kriuchykhin
973efa55e1
Merge branch 'master' into ok_SCI_3678
2019-08-08 11:17:07 +02:00
Luka Murn
75d7cce6b7
Remove the samples -> repositories migration service/s & specs
2019-07-26 10:28:05 +02:00
Luka Murn
83bb89fdf5
Cherry-picked commit from ZZ (and LM)'s various changes
2019-07-26 10:13:14 +02:00
Anton Ignatov
ffd415d409
Inital refactor for Assets model
2019-07-12 15:02:06 +02:00
Anton Ignatov
57a273d5d0
Merge branch 'activestorage_migration' into features/marvinjs-integration
2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin
a1941a21dc
Futher refactoring of old Paperclip methods [SCI-3539]
2019-07-09 10:28:15 +02:00
mlorb
7272d838b6
Merge pull request #1875 from mlorb/ml-sci-3618
...
Remove unassign_user_from_project notification…[SCI-3618]
2019-07-08 15:23:06 +02:00
Oleksii Kriuchykhin
9d926dc956
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
2019-07-05 16:56:05 +02:00
aignatov-bio
65cf5e5787
Fix activities menu selector highlight ( #1877 )
2019-07-03 09:18:41 +02:00
Oleksii Kriuchykhin
4ea6b56582
Fix Step and Result file previews [SCI-3539]
2019-07-01 23:30:20 +02:00
Mojca Lorber
41935a9471
Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation
2019-07-01 13:44:27 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled ( #1872 )
2019-07-01 11:51:13 +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
6be227b2d3
Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
2019-06-28 10:47:38 +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
Anton Ignatov
bc98cac9cc
Trunc long protocol name on task page
2019-06-20 15:28:15 +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
aignatov-bio
9653f16196
Convert image to base64 in PDF reports [SCI-3557] ( #1835 )
...
* Convert image to base64 in PDF reports
* Fix typo error
2019-06-19 13:57:04 +02:00
aignatov-bio
7a3eedf461
Adding missing avatars to comments ( #1838 )
2019-06-14 16:20:13 +02:00
Oleksii Kriuchykhin
6e1a7a3392
Implement saving of attachments ordering on steps [SCI-3436]
2019-06-11 10:08:33 +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
Anton Ignatov
c9a29b12ba
Merge branch 'master' into features/marvinjs-integration
2019-05-31 10:27:14 +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
Oleksii Kriuchykhin
882c12cd31
Remove protocol description from preview popup [SCI-3485]
2019-05-20 15:04:54 +02:00
Anton Ignatov
259b75a6ba
Merge branch 'master' into features/marvinjs-integration
2019-05-16 09:28:48 +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
364f903b3c
Fix protocol preview name ( #1749 )
2019-05-13 10:17:47 +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
Luka Murn
b78caef915
Fix the file preview modal so it supports WOPI_ENABLED == false
2019-05-10 16:41:11 +02:00
Anton Ignatov
f80d881847
Fix markup
2019-04-28 19:11:41 +02:00
Anton Ignatov
2847ec7609
Add env variable and check for MarvinJS available
2019-04-28 17:08:18 +02:00
Anton Ignatov
46f0e0c0c2
Add marvin js assets to assets sort and name field
2019-04-27 12:46:45 +02:00
Urban Rotnik
c41413234c
Use MS office icons for MS files
2019-04-26 09:29:39 +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
b1dabaca15
New helper for file thumbnails
2019-04-23 13:50:48 +02:00
Anton Ignatov
aa2dab2014
Merge branch 'features/note-section' into master-with-note-section
2019-04-23 10:31:37 +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
