Jure Grabnar
|
f3e6a35121
|
Update PermissionEval tests with team check
|
2019-03-21 10:45:21 +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 |
|
mlorb
|
d26c885be7
|
Merge pull request #1571 from mlorb/ml-sci-3021
Implement changes to current activity loging [SCI-3021]
|
2019-03-21 08:20:02 +01:00 |
|
Mojca Lorber
|
c55e314ed5
|
Refactor upon the review requests
|
2019-03-20 21:34:47 +01:00 |
|
Anton Ignatov
|
5d6f009ee8
|
fix error for delay deleting
|
2019-03-20 15:20:31 +01:00 |
|
Alex Kriuchykhin
|
840f4a9eb0
|
Merge pull request #1573 from okriuchykhin/ok_SCI_3111
Re-enable RTE for steps description fields [SCI-3111].
|
2019-03-20 14:51:17 +01:00 |
|
Anton Ignatov
|
55c93922ea
|
markup fixes
|
2019-03-20 14:46:54 +01:00 |
|
Anton Ignatov
|
07c2819163
|
refactoring tinymce image uploading
|
2019-03-20 14:46:54 +01:00 |
|
Mojca Lorber
|
e34ddeaefd
|
Remove activities from demo project
|
2019-03-20 13:25:59 +01:00 |
|
Mojca Lorber
|
8f8f4aa250
|
Move and update the activities locales
|
2019-03-20 13:20:35 +01:00 |
|
Jure Grabnar
|
5de51f9c58
|
Prevent smart annotations accessing other teams when importing protocol
Closes SCI-3163
|
2019-03-20 12:58:22 +01:00 |
|
aignatov-bio
|
5d9e4f30d4
|
Duplicates name protocol bug and rake task to rename duplicates [SCI-3047] (#1541)
* Fix double protocols bug and rake task to rename duplicates
|
2019-03-20 12:41:14 +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 |
|
Jure Grabnar
|
cf5505d95f
|
Add missing inventory name in notification
Closes SCI-3149
|
2019-03-20 10:52:58 +01:00 |
|
Anton Ignatov
|
29b67be127
|
Fix team selection in global activities and add link from navbar
|
2019-03-20 10:33:22 +01:00 |
|
Mojca Lorber
|
42ff1c0a68
|
fix bug in revert protocol method
|
2019-03-20 09:43:38 +01:00 |
|
aignatov-bio
|
51f6644c16
|
Merge pull request #1567 from aignatov-bio/ai-sci-3166-finalize-the-global-activites
[SCI-3166] Finalize global activities front end
|
2019-03-20 09:02:48 +01:00 |
|
Oleksii Kriuchykhin
|
b46f3566ef
|
Fix rendering of HTML in RTE fields [SCI-3111]
|
2019-03-19 23:32:24 +01:00 |
|
Oleksii Kriuchykhin
|
eb3d1ea6fe
|
Update RTE for step description [SCI-3111]
|
2019-03-19 17:42:49 +01:00 |
|
Luka Murn
|
9efeb32077
|
Merge pull request #1560 from biosistemika/lm-fix-rubocop-line-length
Change line length in rubocop to 120
|
2019-03-19 16:15:50 +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 |
|
Mojca Lorber
|
70eebca5ee
|
experiment activities refactoring
|
2019-03-19 15:33:57 +01:00 |
|
Urban Rotnik
|
1017836c0e
|
Activities service fix
|
2019-03-19 14:12:39 +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 |
|
Anton Ignatov
|
f606210652
|
Rubocop fix
|
2019-03-19 13:52:03 +01:00 |
|
Anton Ignatov
|
87280f083a
|
[SCI-3166] Finalize global activities front end
|
2019-03-19 13:50:55 +01:00 |
|
Alex Kriuchykhin
|
7db53fad7c
|
Merge pull request #1566 from okriuchykhin/ok_SCI_3062
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
|
2019-03-19 13:28:05 +01:00 |
|
Alex Kriuchykhin
|
2e987ceed3
|
Merge pull request #1570 from okriuchykhin/ok_SCI_2997
Add viewing permissions for global activities [SCI-2997]
|
2019-03-19 11:09:35 +01:00 |
|
aignatov-bio
|
a0a3c4b97f
|
Fix file format bug (#1569)
|
2019-03-19 11:06:36 +01:00 |
|
Jure Grabnar
|
8831ebdcc9
|
Merge pull request #1559 from jbargu/jg_sci_2949
Office file in inventory item can be edited in spite of assigned item to a locked task[SCI-2949]
|
2019-03-18 21:11:51 +01:00 |
|
Oleksii Kriuchykhin
|
0c71493fdb
|
Add viewing permissions for global activities [SCI-2997]
|
2019-03-18 15:38:19 +01:00 |
|
Urban Rotnik
|
3802d417ce
|
Merge pull request #1562 from urbanrotnik/ur-SCI-3138-new-activities
New global activities [SCI-3138]
|
2019-03-18 09:07:50 +01:00 |
|
Luka Murn
|
a4ce2b66ce
|
Merge pull request #1565 from Ducz0r/lm-fix-stack-trace-on-wopi-middleware
Fix stack trace trimming on WOPI middleware
|
2019-03-15 14:34:22 +01:00 |
|
Oleksii Kriuchykhin
|
5bc41c1f06
|
Fix task tags field after merging latest master to feature branch
|
2019-03-15 14:21:34 +01:00 |
|
Urban Rotnik
|
5dccdbab17
|
fixup! Fix failing tests
|
2019-03-15 11:12:10 +01:00 |
|
Oleksii Kriuchykhin
|
ba41afe449
|
Re-orginize TinyMCE init callback [SCI-3062][SCI-3071]
|
2019-03-15 11:07:57 +01:00 |
|
Urban Rotnik
|
2ea2700837
|
fixup! Fix failing tests
|
2019-03-15 10:30:51 +01:00 |
|
Oleksii Kriuchykhin
|
2cc170c3d4
|
Close RTE on save [SCI-3062][SCI-3071]
|
2019-03-14 16:27:33 +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 |
|
Oleksii Kriuchykhin
|
06b5667ec5
|
Update VERSION to 1.15.8
|
2019-03-14 11:12:41 +01:00 |
|
Alex Kriuchykhin
|
81a25d9f84
|
Merge pull request #1564 from okriuchykhin/rails_update
Update Rails to 5.1.6.2
|
2019-03-14 09:56:00 +01:00 |
|
Luka Murn
|
fc4b271803
|
Fix stack trace trimming on WOPI middleware
|
2019-03-14 08:34:04 +01:00 |
|
Oleksii Kriuchykhin
|
0b0141de5f
|
Update Rails to 5.1.6.2
|
2019-03-13 20:32:29 +01:00 |
|