Commit graph

74 commits

Author SHA1 Message Date
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +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
Oleksii Kriuchykhin
3a67c99982 Switch to STI for repositories, fix cell values snapshotting [SCI-4516] 2020-04-09 12:33:04 +02:00
Oleksii Kriuchykhin
3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02: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
6f8f89fbf0 Improve speed of global activities fetching query [SCI-4330] 2020-02-07 13:53:25 +01:00
Mojca Lorber
9068c20588 Redesign clear buttons on global activities page 2020-02-07 11:33:25 +01:00
aignatov-bio
e022f7a096 Fix small css issues 2020-01-20 15:48:51 +01:00
aignatov-bio
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
aignatov-bio
464d03558a Fix markup, replace buttons and 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
e99fe2dbda Update css for global activties page 2019-11-25 11:09:37 +01:00
aignatov-bio
f2ed3198d5 Add due date autosave field 2019-11-21 12:14:43 +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
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
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
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
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
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
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
Oleksii Kriuchykhin
d6bd703ec8 Fix activity genereation with discarded inventories [SCI-3290] 2019-04-03 21:18:48 +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
Jure Grabnar
8443ed0fb3 Add sanitize input to old activity messages 2019-04-02 11:25:07 +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
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
Urban Rotnik
2487089dd3 Rename dropdown labels for Activities, Users and Teams 2019-03-27 05:47:54 +01:00