aignatov-bio
54fd3a748b
Adding activity groups [SCI-3203] ( #1588 )
...
* Adding activty groups
2019-03-26 15:29:21 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities
2019-03-25 14:35:24 +01:00
aignatov-bio
9fff93ab0e
Merge pull request #1576 from biosistemika/image-editor-prototype
...
Feature/Image annotation
2019-03-22 16:31:00 +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
1418abc8d7
Reports 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
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
Luka Murn
fc4b271803
Fix stack trace trimming on WOPI middleware
2019-03-14 08:34:04 +01:00
Urban Rotnik
32422c00eb
RepositoryRows actions loggin
2019-03-12 09:11:00 +01:00
Urban Rotnik
1a3c97b978
Add new enum values for Activity type_of
2019-03-12 09:11:00 +01:00
Oleksii Kriuchykhin
af94f79f0d
Submit image as FormData [SCI-2879]
2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin
89e968c410
Add tui.image-editor [SCI-2815]
2019-03-11 15:08:15 +01:00
Urban Rotnik
b8e84b5685
Add logic for saving message items values and types
2019-03-11 08:37:22 +01:00
Oleksii Kriuchykhin
0b87e8e1e4
Merge branch 'features/global-activities' into ok_SCI_3024_v3
2019-03-08 10:29:51 +01:00
Oleksii Kriuchykhin
0c99ea9c5c
Fix local storage file download links [SCI-3048]
2019-03-07 16:46:05 +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
Oleksii Kriuchykhin
74a60d443d
Merge branch 'features/global-activities' into ok_SCI_3014_v2
2019-02-26 13:46:25 +01:00
Oleksii Kriuchykhin
61147b480c
Add main global activities bussiness logic [SCI-3014]
2019-02-26 11:01:15 +01:00
Urban Rotnik
5a123d26ac
Activity model update
2019-02-26 07:15:05 +01:00
Urban Rotnik
7b6c6c414d
Merge branch 'master' into features/templates
2019-02-19 14:46:15 +01:00
Urban Rotnik
5b55860dea
Add scheduler
2019-02-13 15:48:15 +01:00
Oleksii Kriuchykhin
da30d187a6
Create templates project when syncing templates if team doesn't have it [SCI-3039]
2019-02-13 15:17:33 +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
Oleksii Kriuchykhin
cc92de3726
Merge latest features/templates [SCI-2939]
2019-01-30 10:43:54 +01:00
Urban Rotnik
863e3873c2
Comment for depricated NotificationType
2019-01-29 11:40:26 +01:00
Oleksii Kriuchykhin
bd2efa55ac
Add templates business logic [SCI-2939]
2019-01-25 10:55:08 +01:00
Urban Rotnik
6cf4717ab3
Add envirnoments to run app without docker, reorder Gemfile
...
- Reorder Gemfile into alphabet order (rule by Rubocop)
- Add extra ENV variable for custom DB settings locally
- Add extra ENV for disable spoof check on Paperclip
2019-01-18 16:01:09 +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
c2b38af91e
Merge pull request #1439 from okriuchykhin/ok_SCI_2888
...
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
2019-01-10 11:05:07 +01:00
Oleksii Kriuchykhin
6a64b23f90
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
2019-01-04 10:44:38 +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
Oleksii Kriuchykhin
3277ab1422
Fix default value setting for rack attack [SCI-2864]
2018-12-17 15:15:56 +01:00
Alex Kriuchykhin
a4b75f00d2
Merge pull request #1400 from okriuchykhin/ok_SCI_2727
...
Make AWS access key variables optional [SCI-2727]
2018-11-28 14:45:45 +01:00
Oleksii Kriuchykhin
32d00cb2b9
Make AWS access key variables optional [SCI-2727]
2018-11-28 10:41:05 +01:00
Alex Kriuchykhin
5ce6a9babd
Merge pull request #1399 from okriuchykhin/ok_SCI_2727
...
Add subfolder option to S3 bucket config [SCI-2727]
2018-11-27 17:46:36 +01:00
Oleksii Kriuchykhin
32536db171
Add subfolder option to S3 bucket config [SCI-2727]
2018-11-27 14:58:34 +01:00
mlorb
18d9ab5888
fixes upon @Ducz0r request
2018-11-26 14:23:26 +01:00
mlorb
4052fad9e0
fix hound
2018-11-23 15:51:18 +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
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
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
Oleksii Kriuchykhin
8d0dbc7076
Add time format selection to settings [SCI-2778]
2018-11-09 16:19:40 +01:00
Oleksii Kriuchykhin
60e78fa868
Improve code style for error handling [SCI-2773]
2018-11-07 15:43:44 +01:00
Alex Kriuchykhin
e9b64b65a3
Merge pull request #1330 from okriuchykhin/ok_SCI_2770
...
Add request rate throttling for API [SCI-2770]
2018-10-19 09:38:31 +02:00
Oleksii Kriuchykhin
ed46115b3f
Implement inventory column data type name mappings [SCI-2772]
2018-10-16 15:35:02 +02:00
Matej Zrimšek
17380ba0ca
Refactoring rebased code [SCI-2641]
2018-10-15 01:12:25 +02:00
Matej Zrimšek
aa30cf6130
Refactor StringUtility#to_filesystems_compatible_filename [SCI-2641]
2018-10-12 07:40:22 +02:00
