Commit graph

610 commits

Author SHA1 Message Date
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
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
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
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +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
Mojca Lorber
4f9814b884 Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021 2019-03-20 11:03:00 +01:00
Mojca Lorber
cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Mojca Lorber
c476816359 Task activities refactoring, without tests 2019-03-19 15:33:57 +01:00
Mojca Lorber
7757096693 Results activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
d1e38e5bc9 Project activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik
fe35c805b7 Add model breadcrumbs, update activities_helper 2019-03-19 14:01:06 +01:00
Urban Rotnik
b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +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
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
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
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
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
aignatov-bio
5fdba554d2
Merge pull request #1510 from biosistemika/features/system-notifications
Features/system notifications
2019-02-20 17:22:57 +01:00
Urban Rotnik
8768fcac6c Copy change 2019-02-20 14:19:59 +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
d3d9868ba4 Set version for HTTParty dependency, add opts in mailer 2019-02-19 11:23:01 +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
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
Urban Rotnik
16e9a56874 Add recaptcha to invitation modal
SCI-2935
2019-01-25 11:27:01 +01:00
mlorb
7fdef4d3ec Change experiment cards look and feel 2019-01-18 15:57:44 +01:00
Oleksii Kriuchykhin
2769add4d9 Disable edit button for unsupported WOPI formats [SCI-2904] 2018-12-31 18:10:12 +01:00
Oleksii Kriuchykhin
5b566b48ae Improve error messages and fix task users/items endpoints [SCI-2886] 2018-11-28 14:14:45 +01:00