Anton Ignatov
fef691d30f
Add error handling and secutiry checks
2019-05-02 16:12:25 +02:00
Anton Ignatov
f73dd38780
Add image editor to tinymce drawings
2019-04-30 18:32:59 +02:00
Anton Ignatov
4d0d5aa014
Adding team sketches selector
2019-04-30 17:32:55 +02:00
Oleksii Kriuchykhin
4522e6bf06
Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401]
2019-04-30 17:04:48 +02:00
aignatov-bio
60296419e8
Update project card due date dropdown ( #1716 )
2019-04-30 13:30:09 +02:00
Anton Ignatov
7c55fcf0cf
Merge branch 'master' into master-with-note-section
2019-04-30 12:07:59 +02:00
mlorb
9f0983de77
Merge pull request #1706 from mlorb/ml-sci-3350
...
Change ownership of inventory items, when a user leaves a team [SCI-3350]
2019-04-30 10:39:14 +02:00
aignatov-bio
687b53feb1
Add new tag activtiies [SCI-3341] ( #1712 )
...
* Add new tag activtiies
2019-04-30 10:23:09 +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
260810fff8
Add editing mode for tinymce images
2019-04-28 16:16:31 +02:00
Anton Ignatov
cf4ff41ec6
Add delete feature
2019-04-27 13:51:35 +02:00
Anton Ignatov
46f0e0c0c2
Add marvin js assets to assets sort and name field
2019-04-27 12:46:45 +02:00
Anton Ignatov
fe620c4a63
Add marvin model and controller
2019-04-26 22:59:38 +02:00
Anton Ignatov
40c1c9aef7
Add marvin js modal
2019-04-26 18:24:21 +02:00
aignatov-bio
dc7fddc60a
Improve task tags ( #1708 )
2019-04-26 15:38:33 +02:00
Mojca Lorber
eac90109f7
Change ownership of inventory items, when a user leaves a team
2019-04-26 10:47:08 +02:00
aignatov-bio
1a860037f7
Update reports for new RTE [SCI-3263] ( #1691 )
...
* Update reports for new RTE
2019-04-25 16:16:43 +02:00
Urban Rotnik
0cf688be39
Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes
...
Comments section changes [SCI-3135]
2019-04-25 14:18:05 +02:00
Oleksii Kriuchykhin
8bec85c7b9
Switch to memory_store for caching in production [SCI-3182]
2019-04-24 19:17:31 +02:00
Anton Ignatov
e52b985e7b
xMerge branch 'ur-sci-3135-comments-section-changes' of https://github.com/urbanrotnik/scinote-web into urbanrotnik-ur-sci-3135-comments-section-changes
2019-04-24 13:40:41 +02:00
aignatov-bio
84993ea3ef
Update protocol repository for new description format [SCI-3371] ( #1689 )
...
* Update protocol repository for new description format
* move image clone method to concerns
2019-04-24 13:34:56 +02:00
Oleksii Kriuchykhin
7c91b4a255
Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266
2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin
c7a707f9db
Fix task clonning with TinyMCE images [SCI-3266]
2019-04-23 15:16:40 +02:00
Urban Rotnik
774521df7a
Changes to comments section in Task Steps
2019-04-23 15:02:58 +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
ea0368aa11
Attachments update for edit page
2019-04-23 13:50:47 +02:00
Anton Ignatov
aa2dab2014
Merge branch 'features/note-section' into master-with-note-section
2019-04-23 10:31:37 +02:00
aignatov-bio
6b45dcd475
Update eln export for new tinyMCE image format ( #1680 )
2019-04-19 14:44:40 +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
f47d0e2932
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload
...
Improve the image file upload into RTE input fields [SCI-3131]
2019-04-10 14:04:06 +02:00
Urban Rotnik
caccf8d9f0
Reset counter for export in last 24 hours
...
Fix for check if user has avaiable exports, bit refactored increas_counter method.
2019-04-10 10:56:33 +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
Urban Rotnik
ee3dc571e1
Update attachments view, add ordering on FE
2019-04-09 14:17:40 +02:00
Urban Rotnik
a3932cc67f
New asset box style update
2019-04-09 14:17:40 +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
Jure Grabnar
fddff9c627
Perform styling on the WOPI modal
2019-04-04 17:05:25 +02:00
Jure Grabnar
b12916b828
Add main functionality
2019-04-04 17:05:25 +02:00
Jure Grabnar
613843d095
Temp commit
2019-04-04 16:58:55 +02:00
Jure Grabnar
3b8e6fa47c
Test office online
2019-04-04 16:57:36 +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
Jure Grabnar
7136294386
Remove archive_task from the list of activity_types
...
Closes SCI-3288
2019-04-03 19:13:00 +02:00
Oleksii Kriuchykhin
9e91e9e59d
Improve large image saving after editing [SCI-3289]
2019-04-03 16:31:56 +02:00
Urban Rotnik
1257c8fd80
Fix archive task translation
2019-04-03 11:21:53 +02:00
Jure Grabnar
22d193114e
Add asset to activity message item type
...
Closes SCI-3283
2019-04-02 16:10:20 +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
5c8f976ad1
Adding missed project comment activities [SCI-3250] ( #1612 )
...
* Adding missed project comment activities
* Fix markup
2019-03-29 11:45:31 +01:00
aignatov-bio
b51dcc9d75
Adding children selector to global activities subjects [SCI-3247] ( #1605 )
...
* Adding children selector to global activities subjects
* Fix naming, add seperate check for project id
2019-03-29 09:26:27 +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
aignatov-bio
54fd3a748b
Adding activity groups [SCI-3203] ( #1588 )
...
* Adding activty groups
2019-03-26 15:29:21 +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
Jure Grabnar
171b2eeedc
Remove the title of protocol steps when empty
...
Closes SCI-3072
2019-03-25 09:36:56 +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
Anton Ignatov
4ec0a3c871
Update TinyMCE image loader for new fields
2019-03-22 10:52:26 +01:00
Anton Ignatov
bc58f0aecd
Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload
2019-03-21 11:48:51 +01:00
aignatov-bio
e8827b0d74
Update tags in task info [SCI-3093] ( #1575 )
...
* Adding inline tags selection
2019-03-21 10:13:07 +01:00
Mojca Lorber
c55e314ed5
Refactor upon the review requests
2019-03-20 21:34:47 +01:00
Anton Ignatov
55c93922ea
markup fixes
2019-03-20 14:46:54 +01:00
Mojca Lorber
8f8f4aa250
Move and update the activities locales
2019-03-20 13:20:35 +01:00
Oleksii Kriuchykhin
0c2b7959b6
Fix smart annotations in RTE [SCI-3111]
2019-03-20 11:41:36 +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
1418abc8d7
Reports 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
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
Oleksii Kriuchykhin
a822227383
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin
645930b8d7
Merge branch 'master' into features/note-section
2019-03-14 16:25:51 +01:00
Luka Murn
fc4b271803
Fix stack trace trimming on WOPI middleware
2019-03-14 08:34:04 +01:00
Urban Rotnik
b33e95e18a
New Protocols actions logging
2019-03-12 09:14:53 +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
37dc8298b7
Fix webpack config [SCI-2856]
2019-03-11 15:13:06 +01:00
Oleksii Kriuchykhin
9bbdc8fc89
Include tui image editor with webpack [SCI-2856]
2019-03-11 15:12:38 +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
Urban Rotnik
b8e84b5685
Add logic for saving message items values and types
2019-03-11 08:37:22 +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
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
aignatov-bio
125d2a3b9b
New inline tags editing in task [SCI 3093] ( #1529 )
...
* Adding inline tags selection
2019-03-06 09:18:45 +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
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
Miha Mencin
a93402d69f
sci-2992 routes
2019-02-25 16:50:38 +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
Urban Rotnik
7b6c6c414d
Merge branch 'master' into features/templates
2019-02-19 14:46:15 +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
c598541e09
System notification modal window [SCI-2957 and SCI-2958] ( #1484 )
...
* Added new system notification modal
* Adding loading system notification on sign in
2019-02-15 13:07:29 +01:00
Urban Rotnik
5b55860dea
Add scheduler
2019-02-13 15:48:15 +01:00
Urban Rotnik
9f3187abdf
Add service for sync system notifications
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
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
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
Urban Rotnik
16e9a56874
Add recaptcha to invitation modal
...
SCI-2935
2019-01-25 11:27:01 +01:00
Oleksii Kriuchykhin
bd2efa55ac
Add templates business logic [SCI-2939]
2019-01-25 10:55:08 +01:00
mz3944
f6c8af105d
Merge pull request #1434 from mz3944/mz-SCI-2903
...
Fix (unite) Date and Time display formats [SCI-2903]
2019-01-21 09:50:34 +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
mlorb
7fdef4d3ec
Change experiment cards look and feel
2019-01-18 15:57:44 +01:00
Miha Mencin
0766ee96a7
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2
...
Fix task tags update on canvas cards [SCI-2875]
2019-01-16 12:44:50 +01:00
Oleksii Kriuchykhin
89240659a7
Fix task tags update on canvas cards [SCI-2875]
2019-01-11 17:20:39 +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
Matej Zrimšek
8070b7f8b5
Fix Date and Time display formats on JS side
2019-01-08 08:07:24 +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
Alex Kriuchykhin
c536130cef
Merge pull request #1427 from okriuchykhin/ok_SCI_2864
...
Fix default value setting for rack attack [SCI-2864]
2018-12-17 15:30:54 +01:00
Oleksii Kriuchykhin
3277ab1422
Fix default value setting for rack attack [SCI-2864]
2018-12-17 15:15:56 +01:00
Alex Kriuchykhin
4e416fe81b
Merge pull request #1404 from okriuchykhin/ok_SCI_2822
...
Return task inputs/outputs as references [SCI-2822]
2018-12-12 11:36:39 +01:00
Alex Kriuchykhin
37db41e18e
Merge pull request #1405 from okriuchykhin/ok_SCI_2881
...
Refresh sidebar when project is archived/restored [SCI-2881]
2018-12-10 14:11:34 +01:00
Oleksii Kriuchykhin
2c96f08b98
Refresh sidebar when project is archived/restored [SCI-2881]
2018-11-29 14:20:20 +01:00
Alex Kriuchykhin
32e9566915
Merge pull request #1401 from okriuchykhin/ok_SCI_2886
...
Improve error messages and fix task users/items endpoints [SCI-2886]
2018-11-28 18:24:53 +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
5b566b48ae
Improve error messages and fix task users/items endpoints [SCI-2886]
2018-11-28 14:14:45 +01:00
Oleksii Kriuchykhin
b3a377f949
Return task inputs/outputs as references [SCI-2822]
2018-11-28 11:33:00 +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
398c2f0576
Merge pull request #1392 from mlorb/ml-sci-2676
...
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]
2018-11-27 11:06:45 +01:00
Jure Grabnar
7812f70c2f
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix
...
Protocols - import from protocols.io doesn't work
2018-11-26 14:56:25 +01:00
mlorb
18d9ab5888
fixes upon @Ducz0r request
2018-11-26 14:23:26 +01:00
Jure Grabnar
2834edb286
Add command/subprotocol/safety for PIO
2018-11-23 20:13:34 +01:00
Jure Grabnar
c00b08b101
Add sw_package and dataset component for PIO
2018-11-23 19:44:10 +01:00
Jure Grabnar
87d5e5029a
Fix publish_date in PIO import
2018-11-23 17:37:26 +01:00
Luka Murn
87ff7c71e3
Update the delivery email look & feel
...
Closes SCI-2884.
2018-11-23 17:24:10 +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
Luka Murn
af307eae73
Move some text into localization file
2018-11-23 11:12:10 +01:00
Alex Kriuchykhin
95e19e1229
Merge pull request #1381 from okriuchykhin/ok_SCI_2859
...
Refactor & restyle the API authorization screen [SCI-2859]
2018-11-22 13:06:13 +01:00
Oleksii Kriuchykhin
d98f11abdc
Refactor & restyle the API authorization screen [SCI-2859]
2018-11-20 17:02:45 +01:00
Oleksii Kriuchykhin
5deaf25fd9
Prevent user being added to project/task multiple times [SCI-2869]
2018-11-20 14:29:33 +01:00
mlorb
3b96a60938
Merge pull request #1374 from mlorb/ml-sci-2842
...
Update the Export all confirmation modal and export interaction [SCI-2842]
2018-11-19 11:36:08 +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
mlorb
4b540958bd
change close/cancel button and refactor export_project_modal endpoint
2018-11-16 13:37:32 +01:00
mlorb
6453ab6fb1
update the Export all confirmation modal and export interaction
2018-11-15 15:53:58 +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
537de596a7
Merge latest master [SCI-2778]
2018-11-14 13:05:57 +01:00
Luka Murn
84df2c81f9
Merge branch 'features/export-all'
...
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin
8d0dbc7076
Add time format selection to settings [SCI-2778]
2018-11-09 16:19:40 +01:00
Oleksii Kriuchykhin
23ee4760ae
Fix failing tests [SCI-2773]
2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin
30885e060d
Merge latest core-api branch [SCI-2773]
2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin
60e78fa868
Improve code style for error handling [SCI-2773]
2018-11-07 15:43:44 +01:00
mlorb
0f8c80172e
remove show protocol api endpoint
2018-10-29 11:21:48 +01:00
Oleksii Kriuchykhin
6d5af3da8f
Remove error message for index page and unauthenticated users [SCI-2775]
2018-10-28 23:19:06 +01:00
Luka Murn
95340bcf36
Update team name placeholder & sublabel on sign up pages
2018-10-24 13:43:56 +02:00
Matej Zrimšek
4bf1d904b7
Add project controller unit tests [SCI-2732]
2018-10-23 19:51:50 +02:00
Oleksii Kriuchykhin
b53f2c8347
Improve error messages in API [SCI-2773]
2018-10-23 17:52:48 +02: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
mlorb
e5fca1b1cd
change the rich text max limit on frontend to 50000
2018-10-18 14:22:15 +02:00
Alex Kriuchykhin
18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772
...
Implement inventory column data type name mappings [SCI-2772]
2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin
02f536cd08
Merge latest features/export-all [SCI-2733]
2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin
ed46115b3f
Implement inventory column data type name mappings [SCI-2772]
2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin
f6b039d54e
Merge latest core-api branch [SCI-2765]
2018-10-16 12:07:47 +02:00
Jure Grabnar
26df1e5a98
Add export project modal
...
Closes [SCI-2645]
2018-10-16 11:00:38 +02:00
Luka Murn
1093ea11f4
Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes
...
Conflicts:
app/serializers/api/v1/activity_serializer.rb
app/serializers/api/v1/inventory_column_serializer.rb
app/serializers/api/v1/project_serializer.rb
2018-10-15 15:20:26 +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
Matej Zrimšek
c0dc4f6951
Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641]
2018-10-12 07:40:21 +02:00
Matej Zrimšek
7152d2f0f1
Fix/update file naming convection for exported files [SCI-2641]
2018-10-12 07:40:21 +02:00
