Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +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
|
7719b825e3
|
Update wording for sharing activities, rename button, add view-only paragraph
|
2019-08-09 14:15:51 +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
|
171cdb319b
|
Add ShareInventory activities
|
2019-08-09 14:13:01 +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 |
|
Anton Ignatov
|
f480c0eb8d
|
Adding new activtiies for image editing
|
2019-06-14 16:15:30 +02:00 |
|
Anton Ignatov
|
7c55fcf0cf
|
Merge branch 'master' into master-with-note-section
|
2019-04-30 12:07:59 +02:00 |
|
aignatov-bio
|
687b53feb1
|
Add new tag activtiies [SCI-3341] (#1712)
* Add new tag activtiies
|
2019-04-30 10:23:09 +02:00 |
|
Mojca Lorber
|
b00cf07684
|
Add activity for importing inventory items
|
2019-04-18 15:18:10 +02:00 |
|
Anton Ignatov
|
dd8b3caf65
|
Fix duplicate activtiy issue and fix link to inventory
|
2019-04-15 11:35:30 +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 |
|
Mojca Lorber
|
501c46bc92
|
Remove activities that belong to addons
|
2019-04-05 16:25:22 +02:00 |
|
aignatov-bio
|
a1047f4597
|
Fix activities wording [SCI-3287] (#1635)
* Fix activities wording
* Adding project to export protocol
|
2019-04-04 10:45:35 +02:00 |
|
Oleksii Kriuchykhin
|
d6bd703ec8
|
Fix activity genereation with discarded inventories [SCI-3290]
|
2019-04-03 21:18:48 +02:00 |
|
Urban Rotnik
|
1257c8fd80
|
Fix archive task translation
|
2019-04-03 11:21:53 +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 |
|
Urban Rotnik
|
0ed96d68de
|
Add step position for steps in Protocol repository. Add default value for blank names also.
|
2019-04-01 15:58:17 +02:00 |
|
Urban Rotnik
|
b91f08fe99
|
Add activity for copying Inventory and Invetory item
|
2019-04-01 15:40:00 +02:00 |
|
mlorb
|
b24a07f1c8
|
Merge pull request #1616 from mlorb/ml-sci-3237
Change activities for task protocols [SCI-3237]
|
2019-04-01 14:32:16 +02:00 |
|
Jure Grabnar
|
6b5cd34811
|
Capitalize the C in clear
Closes SCI-3244
|
2019-03-29 16:02:45 +01:00 |
|
Mojca Lorber
|
3c69225d6b
|
Change activities for task protocols
|
2019-03-29 15:09:20 +01:00 |
|
Jure Grabnar
|
8585be1c90
|
Remove duplicated Task archived activity
|
2019-03-29 15:07:41 +01:00 |
|
aignatov-bio
|
ce7bbd6b07
|
Adding deselect button to objects filter and some localizations fix (#1608)
|
2019-03-29 09:04:58 +01:00 |
|
mlorb
|
5f663b3c74
|
Merge pull request #1600 from mlorb/ml-sci-3215
Implement missing tests for global activities [SCI-3215][SCI-3219]
|
2019-03-28 11:10:38 +01:00 |
|
aignatov-bio
|
8416d1ab1c
|
Merge branch 'master' into ai-sci-3239-add-localization-team-for-objects
|
2019-03-28 09:13:34 +01:00 |
|
Jure Grabnar
|
aa186f675a
|
Fix clear filter not clearing date label
Closes SCI-3226
|
2019-03-27 18:47:34 +01:00 |
|
Anton Ignatov
|
3676aeb83c
|
Adding localization to subjects group name in filters
|
2019-03-27 15:30:04 +01:00 |
|
Anton Ignatov
|
03123c34f8
|
adding date placeholder
|
2019-03-27 14:39:29 +01:00 |
|
Mojca Lorber
|
f06358b2ae
|
Implement missing tests for global activities (task and protocol activities)
|
2019-03-27 11:24:44 +01:00 |
|
Anton Ignatov
|
1d244508f5
|
Adding placeholders to filters
|
2019-03-27 11:19:58 +01:00 |
|
aignatov-bio
|
c2e1e85913
|
Adding localization for activity name and activity group (#1598)
|
2019-03-27 10:33:33 +01:00 |
|
Urban Rotnik
|
2487089dd3
|
Rename dropdown labels for Activities, Users and Teams
|
2019-03-27 05:47:54 +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 |
|
Miha Mencin
|
9a30d7be9d
|
SCI-3232 renaming the attribute name so it doesnt get 'constantized'
|
2019-03-26 11:39:54 +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 |
|
Mojca Lorber
|
c55e314ed5
|
Refactor upon the review requests
|
2019-03-20 21:34:47 +01:00 |
|
Mojca Lorber
|
8f8f4aa250
|
Move and update the activities locales
|
2019-03-20 13:20:35 +01:00 |
|
Urban Rotnik
|
fe35c805b7
|
Add model breadcrumbs, update activities_helper
|
2019-03-19 14:01:06 +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 |
|