scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 17:36:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
5687 commits 69 branches 179 tags 165 MiB
Commit graph

5687 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik 80cd01c2e5
Merge pull request #1587 from urbanrotnik/ur-SCI-3207-remove-search-field 
Comment out search field for global activities [SCI-3207]
 2019-03-26 12:37:07 +01:00
Urban Rotnik 96fa620c4c Add fontawesome checkmark before dropdown item 
SCI-3209
 2019-03-26 12:35:17 +01:00
Miha Mencin 9a30d7be9d SCI-3232 renaming the attribute name so it doesnt get 'constantized' 2019-03-26 11:39:54 +01:00
Jure Grabnar 35743434fc
Merge pull request #1577 from jbargu/jg_sci_3072 
Adding steps to Protocol on the task [SCI-3072]
 2019-03-26 10:26:37 +01:00
aignatov-bio cee3796f35
Merge pull request #1583 from aignatov-bio/ai-sci-3203-show-selection-left 
Move dropdown container to left [SCI-3203]
 2019-03-26 09:37:12 +01:00
Urban Rotnik 790f4450cc Comment out search field for global activities 2019-03-25 18:15:31 +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
Urban Rotnik b0f0ded87d Step header changes, removed vertical line 
SCI-3134
 2019-03-25 17:25:13 +01:00
Miha Mencin 37c8d9b36f
Merge pull request #1585 from biosistemika/fix-failing-tests 
removing activity creation from demo project
 2019-03-25 16:05:06 +01:00
Miha Mencin 4c3c0ef908 removing activity creation from demo project 2019-03-25 15:45:10 +01:00
Miha Mencin 4e9d566934
Merge pull request #1584 from biosistemika/features/global-activities 
Features/global activities
 2019-03-25 14:37:50 +01:00
Miha Mencin 4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Anton Ignatov 2d5df1b3b7 Moving dropdown container to left 2019-03-25 13:56:32 +01:00
aignatov-bio fd6e622b95
Merge pull request #1579 from aignatov-bio/ai-sci-3205-remove-whitespace-for-dates 
Remove white spaces for date in global activities [SCI-3205]
 2019-03-25 12:58:35 +01:00
aignatov-bio 282d67fdfd
Merge pull request #1578 from aignatov-bio/ai-sci-3218-reduce-white-space 
Remove whitespace to breadcrumbs [SCI-3218]
 2019-03-25 12:58:21 +01:00
Anton Ignatov c584a0d606 Remove white spaces for date in global activites 2019-03-25 11:06:00 +01:00
Anton Ignatov c8c211f245 Remove whitespace to breadcrumbs 2019-03-25 09:39:17 +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 fc7400bec9 fix markup 2019-03-22 13:42:12 +01:00
Anton Ignatov 65521533b4 change js.erb to js 2019-03-22 13:35:11 +01:00
Anton Ignatov 4ec0a3c871 Update TinyMCE image loader for new fields 2019-03-22 10:52:26 +01:00
aignatov-bio 723024202e
Image editor improvements [SCI - 3158, 3160, 3156, 3154] (#1563) 
* Improvments SCI - 3158, 3160, 3156, 3154
 2019-03-22 09:27:50 +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
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