scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
8905 commits 70 branches 179 tags 165 MiB
Commit graph

420 commits

Author SHA1 Message Date
aignatov-bio 8f946c45c3
Merge pull request #2553 from aignatov-bio/ai-sci-4518-optimize-task-mobile-view 
Small CSS improvments for mobile [SCI-4518]
 2020-05-14 14:20:40 +02:00
aignatov-bio 9b685fdaa6
Merge pull request #2554 from aignatov-bio/ai-sci-4613-add-icon-to-cancel-button 
Add icon to cancel button [SCI-4613]
 2020-05-14 13:19:20 +02:00
aignatov-bio 445f55acc7
Merge pull request #2555 from aignatov-bio/ai-sci-4598-change-task-details-to-onclick 
Replace bootstrap popover with bootstrap dropdown [SCI-4598]
 2020-05-14 13:19:08 +02:00
Oleksii Kriuchykhin ba1661b40f Fix handling of deleted repositories for snapshots [SCI-4596] 2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
aignatov-bio 8447a13afd Replace bootstrap popover with bootstrap dropdown 2020-05-13 12:20:25 +02:00
aignatov-bio f6b239c144 Add icon to cancel button 2020-05-13 11:09:19 +02:00
aignatov-bio bd742d388d Small CSS improvments for mobile 2020-05-13 10:58:40 +02:00
aignatov-bio 8e20dccc66
Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab 
Add recent protocol tab to load protocal from repository [SCI-4509]
 2020-05-08 13:17:26 +02:00
aignatov-bio c9545ddb19 Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab 2020-05-08 10:28:33 +02:00
aignatov-bio dad5ac7a27 Fix snapshot button place 2020-05-07 19:36:30 +02:00
Mojca Lorber b3bce933e5 Task details description corrections and some changes of locales 2020-05-07 16:11:22 +02:00
aignatov-bio fe658a9b23
Merge pull request #2534 from aignatov-bio/ai-sci-4594-refactor-css-for-full-view-repository-view 
Update CSS for full view assigned rows modal [SCI-4594]
 2020-05-07 15:22:06 +02:00
aignatov-bio 912b01d34b
Merge pull request #2539 from aignatov-bio/ai-sci-4573-small-css-fixes-for-protocols 
Fix css for comments and fix modal title size [SCI-4573]
 2020-05-07 12:59:56 +02:00
aignatov-bio 8b5872347a
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown 
Add new protocol template dropdown [SCI-4538]
 2020-05-07 08:32:54 +02:00
aignatov-bio 5972c3fdf6 Fix css for comments and fix modal title size 2020-05-06 13:54:39 +02:00
aignatov-bio 4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +02:00
aignatov-bio a29db548f8 Update CSS for full view assigned rows modal 2020-05-05 18:17:14 +02:00
Alex Kriuchykhin 7e9054e6d2
Merge pull request #2519 from aignatov-bio/ai-sci-4523-add-assign-items-to-task 
Add assign items modal and update modal for task inventories [SCI-4523][SCI-4524]
 2020-05-05 13:20:01 +02:00
aignatov-bio c556fd2478
Merge pull request #2530 from aignatov-bio/ai-sci-4574-fix-css-for-results-page 
Fix CSS for results [SCI-4574]
 2020-05-05 12:58:35 +02:00
aignatov-bio cf2508c5d0
Merge pull request #2522 from aignatov-bio/ai-sci-4508-small-protocol-layout-fixes 
Small layout changes for protocol [SCI-4508]
 2020-05-05 12:57:40 +02:00
aignatov-bio 1b57040c37 Fix deepscan issues 2020-05-05 09:44:38 +02:00
aignatov-bio 8c57ed3109 Fix css for results 2020-05-02 22:37:02 +02:00
aignatov-bio 1ed62c4a49 Fix I18n and save to repository button 2020-05-01 20:45:09 +02:00
aignatov-bio 19d30e2019 Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task 2020-04-29 15:13:38 +02:00
Alex Kriuchykhin 0e865f8e45
Merge pull request #2525 from okriuchykhin/ok_SCI_4552 
Implement background processing of repository snapshots [SCI-4552]
 2020-04-29 12:03:23 +02:00
aignatov-bio 046c9662d1 Fix markup 2020-04-28 19:16:04 +02:00
aignatov-bio 61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +02:00
Urban Rotnik 8fa024ed10 Remove all tooltips from HTML 2020-04-28 12:30:43 +02:00
Oleksii Kriuchykhin e6ad5047e0 Implement background processing of repository snapshots [SCI-4552] 2020-04-28 12:09:36 +02:00
aignatov-bio 0a87bd3dcf Fix markup 2020-04-24 15:48:40 +02:00
aignatov-bio ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00
Mojca Lorber 008ab8ab86 Remove redundant data-hook from protocol options dropdown 2020-04-24 15:10:42 +02:00
aignatov-bio 4f941610b2 Small layout changes for protocol 2020-04-24 11:50:03 +02:00
mlorb 1cea6116b5
Merge pull request #2515 from mlorb/ml-sci-4493 
Add protocol options dropdown [SCI-4493]
 2020-04-23 17:21:26 +02:00
aignatov-bio f65b50c6ff Fix rebase conflicts 2020-04-23 16:36:22 +02:00
aignatov-bio 5b375168c0 Add I18n 2020-04-23 15:24:40 +02:00
aignatov-bio 34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
Alex Kriuchykhin 1802d7cb59
Merge pull request #2516 from okriuchykhin/ok_SCI_4525 
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
 2020-04-23 13:18:23 +02:00
Oleksii Kriuchykhin 06b6907d13 Handle situation when task creator or modifier is not present [SCI-4503] 2020-04-23 12:40:27 +02:00
Oleksii Kriuchykhin 608ee23ec4 Add task details popover [SCI-4503] 2020-04-21 15:11:57 +02:00
Oleksii Kriuchykhin f811d11c59 Add versions sidebar to assigned repository rows full view modal [SCI-4525] 2020-04-21 14:49:36 +02:00
Mojca Lorber 6fecee8c0c Add protocol options dropdown 2020-04-21 10:03:53 +02:00
aignatov-bio be47efce74
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list 
Add repositories dropdown list [SCI-4506]
 2020-04-16 14:17:17 +02:00
mlorb 9584b11d45
Merge pull request #2507 from mlorb/ml-sci-4505 
Add the user management section of to the Details section of task layout [SCI-4505]
 2020-04-16 13:47:31 +02:00
Mojca Lorber e9959747d6 small refactor 2020-04-14 17:25:36 +02:00
aignatov-bio 338f3a0192 Fix css 2020-04-14 13:08:07 +02:00
aignatov-bio 15b291347b Fix I18n 2020-04-14 12:10:17 +02:00
aignatov-bio c1cac01b28 Add repositories dropdown list 2020-04-14 12:10:16 +02:00
aignatov-bio fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +02:00
Mojca Lorber f22f076e6c Add the user management secion of to the Details section of task layout 2020-04-08 16:24:59 +02:00
aignatov-bio e4b65aaf6f Finish full view repository 2020-04-08 15:13:21 +02:00
aignatov-bio 087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
aignatov-bio 845e8c3d6d Fix loading process 2020-04-07 12:36:01 +02:00
aignatov-bio 7fdc169ba2 Add simple view to repository table 2020-04-06 19:52:41 +02:00
aignatov-bio fc810b5524
Merge pull request #2503 from aignatov-bio/ai-sci-4507-add-assigned-repositories-list 
Add assigned repositories list [SCI-4507]
 2020-04-03 13:59:26 +02:00
aignatov-bio 9a64ebdfd0 Update sql and add accordion effect 2020-04-03 13:15:56 +02:00
aignatov-bio dd3f2cb219 Update my_module assigned repository method 2020-04-03 12:33:42 +02:00
aignatov-bio 9678372dd5 Add assigned repositories list 2020-04-02 12:05:07 +02:00
Mojca Lorber cb554e815a Add new task layout details section 2020-04-01 13:05:35 +02:00
Oleksii Kriuchykhin 3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Mojca Lorber bd177f4f2f Renaming fixes 2020-03-31 11:22:53 +02:00
mlorb ea6eb0cace
Merge branch 'features/new-task-layout' into ml-sci-4483-sci-4486 2020-03-30 14:27:35 +02:00
aignatov-bio 10bd1d425d Fix placeholder for tinymce description fields 2020-03-30 13:22:34 +02:00
Mojca Lorber 7006036626 Add new task general layout and add notes section 2020-03-30 12:51:35 +02:00
Alex Kriuchykhin 4fe3d9f3a7
Merge pull request #2414 from aignatov-bio/ai-sci-4134-auto-open-tiny-mce-if-unsaved-data 
Open unsaved TinyMce editor [SCI-4134]
 2020-03-30 09:50:32 +02:00
Miha Mencin be8e18110d
Merge pull request #2481 from mlorb/ml-sci-4344 
Fix tooltips appear wrongly [SCI-4344]
 2020-03-24 19:43:34 +01:00
Oleksii Kriuchykhin f9a7d58157 Fix due dates on task cards in the canvas [SCI-4487] 2020-03-24 10:30:29 +01:00
Mojca Lorber 9045d1a8de Fix tooltips appear wrongly 2020-03-22 17:47:13 +01:00
aignatov-bio b188b0511b Refactor TinyMCE autosave check 2020-03-19 15:45:14 +01:00
Oleksii Kriuchykhin a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
Mojca Lorber 9068c20588 Redesign clear buttons on global activities page 2020-02-07 11:33:25 +01:00
Mojca Lorber e70bc67146 Implement missing style guide changes 2020-01-31 14:11:37 +01:00
aignatov-bio 79d71f1e9b
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker 
Add new emoji picker [SCI-4268]
 2020-01-21 16:33:05 +01:00
Mojca Lorber 981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
Urban Rotnik 1ecea5216e Add webpack libs for emojis and assets 2020-01-21 11:43:04 +01:00
mlorb 9747a72567
Merge pull request #2338 from mlorb/ml-sci-4132-v2 
Change html structure for flash msg, change columns buttons [SCI-4132]
 2020-01-20 14:36:33 +01:00
Mojca Lorber 772118d246 change html structure for flash msg, change columns buttons 2020-01-20 14:02:42 +01:00
Urban Rotnik fc29641c2b Hide manage column action buttons on Task page 2020-01-17 17:29:26 +01:00
aignatov-bio b116c3720c Fix general css issue for repositories 2020-01-15 16:46:01 +01:00
Mojca Lorber 9176301b7b Refactor manage repository columns, move it from page into modal 2020-01-14 11:13:19 +01:00
aignatov-bio 68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
aignatov-bio 464d03558a Fix markup, replace buttons and add new logo 2020-01-06 10:40:20 +01:00
aignatov-bio a281f09e7f Add reports and missed modals 2020-01-06 10:40:20 +01:00
aignatov-bio ef3814ccec Add new buttons to protocols, tasks, experiments, projects 2020-01-06 10:40:20 +01:00
aignatov-bio 010a44650c Fix task activity page 2019-12-02 16:04:50 +01:00
aignatov-bio 75f29d7b04 Fix tag edit mode 2019-11-27 12:34:54 +01:00
aignatov-bio e76b4ca26f Fix permission check and due date clear 2019-11-24 21:06:34 +01:00
aignatov-bio 96523ae131 Update CSS for team preferences and enable autosave 2019-11-22 10:46:44 +01:00
aignatov-bio c712e4e48c Fix due date moda 2019-11-21 13:05:36 +01:00
aignatov-bio f2ed3198d5 Add due date autosave field 2019-11-21 12:14:43 +01:00
aignatov-bio 264493a322 Finish removing Select2 library 2019-11-18 13:59:55 +01:00
aignatov-bio e7ad7ae969 New tags drop down 2019-11-18 13:59:55 +01:00
Anton Ignatov 7117b767f4 Fix commnets to PR 2019-11-18 13:59:54 +01:00
Anton Ignatov 17e457c686 Finished global activities refactoring 2019-11-18 13:59:54 +01:00
Anton Ignatov fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +01:00
aignatov-bio 3eb6f5695b
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004 
Add auto-save feature to text fields [SCI-4004]
 2019-11-18 09:11:10 +01:00
aignatov-bio 19f5f9de67 Disable autocomplete for textarea field 2019-11-12 14:44:33 +01:00
aignatov-bio a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
Anton Ignatov 33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Urban Rotnik dfafd4767c Fix Protocol buttons group 
[SCI-3929]
 2019-09-30 11:51:37 +02:00
Jure Grabnar b3cafcec7c Add restore draft notification to all models 
Close SCI-3751
 2019-09-30 11:34:39 +02:00
Jure Grabnar 6e33baa995 Add skeleton restore-draft notification for module description 2019-09-30 11:32:38 +02:00
Anton Ignatov 93363da4e5 Fix preview for result 2019-09-26 16:49:56 +02:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
aignatov-bio 07b9091e23
Fix html escape in unshared warning (#2048) 2019-09-11 16:33:31 +02:00
aignatov-bio 27104a495c
Fix styling for unshared warning message (#2044) 2019-09-11 11:50:02 +02:00
aignatov-bio 1f12a63a25
Fix counter on task inventory and failing test (#2043) 2019-09-10 13:51:37 +02:00
Miha Mencin 01628e1efc adding missing file 2019-09-09 16:46:51 +02:00
Miha Mencin 7fc5035d2d PR fixes, codestyle fixes 2019-09-06 13:47:06 +02:00
Miha Mencin 2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +02:00
mlorb ba5bebedb2 change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022) 2019-09-02 10:30:29 +02:00
Miha Mencin b850efbceb Code review remarks, added tooltip for unshared inventory 2019-08-26 10:45:40 +02:00
Miha Mencin 9e9e698778 SCI-3806 Add an icon indicating shared status to dropdown 2019-08-26 09:14:37 +02:00
aignatov-bio f94b8165dc
Fix marvinjs edit button and icon (#1985) 2019-08-21 11:15:57 +02:00
aignatov-bio e2ad383c69
Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998) 
* Fix ux for task inventory dropdown and big task title

* Fix markup
 2019-08-21 10:39:37 +02:00
aignatov-bio b6661682ad
Fix shared inventory in task dropdown (#1993) 2019-08-19 13:56:02 +02:00
Oleksii Kriuchykhin 973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin b4f632dba8 Remove dowload endpoint from assets controller [SCI-3680] 2019-08-07 15:21:41 +02:00
Urban Rotnik 88fbd6c0af Fix for archived results in row 2019-07-26 11:16:53 +02:00
Anton Ignatov 3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
aignatov-bio fc78d8f401
Fix tooltip position (#1909) 2019-07-09 14:00:53 +02:00
Anton Ignatov 390002f40f Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539 2019-07-01 10:12:26 +02:00
Oleksii Kriuchykhin 5acb16d43e Update Asset helper methods [SCI-3539] 2019-06-28 08:17:09 +02:00
aignatov-bio 4ddcbe5d75 Fix user permission for recent protocols (#1843) 2019-06-19 14:06:02 +02:00
aignatov-bio 52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] (#1800) 
* Add recent protocols dropdown to task page
 2019-06-13 15:47:29 +02:00
aignatov-bio d97e803d01
Adding placeholder to TinyMCE editor (#1788) 2019-05-21 15:53:47 +02:00
Oleksii Kriuchykhin 1128fedc51 Refactor title inline editing permission checking [SCI-3471] 2019-05-20 13:13:31 +02:00
Alex Kriuchykhin bcbaf73669
Merge pull request #1773 from okriuchykhin/ok_SCI_3468 
Add permission checking to inline editor fields [SCI-3468]
 2019-05-15 17:49:15 +02:00
Oleksii Kriuchykhin 2ef926e795 Add permission checking to inline editor fields [SCI-3468] 2019-05-15 17:47:09 +02:00
Alex Kriuchykhin 607356ce1b
Merge pull request #1771 from okriuchykhin/ok_SCI_3466 
Show task due date in UTC [SCI-3466]
 2019-05-15 15:30:17 +02:00
Oleksii Kriuchykhin 71a4a1348a Show task due date in UTC [SCI-3466] 2019-05-15 15:17:44 +02:00
aignatov-bio f970eea525
Some gui fixes (#1757) 2019-05-14 09:43:02 +02:00
Miha Mencin 765c6ebd6a
Merge pull request #1747 from biosistemika/lm-sci-3438-fix 
Fix TinyMCE images in task description and task protocol description view [SCI-3438]
 2019-05-13 10:56:30 +02:00
aignatov-bio 71b3228310
Update protocol preview style [SCI-3416] (#1729) 
* Update protocol appearance
 2019-05-13 10:45:12 +02:00
aignatov-bio 634b58bd6a
Various UX improvements for note section [SCI-3444] (#1742) 
* Various UX improvments for note section
 2019-05-11 16:04:28 +02:00
Luka Murn 059ebf6f27 Fix task and protocol description (TinyMCE) rendering on task page 
Closes SCI-3438.
 2019-05-10 20:39:26 +02:00
Miha Mencin 7c088c8432
Merge pull request #1725 from aignatov-bio/ai-sci-3411-due-date-in-one-line 
Fix due date position [SCI-3411]
 2019-05-07 16:34:23 +02:00
Anton Ignatov 0e1e7c3d82 Fix button icon for uncomplete task 2019-05-06 16:35:46 +02:00
Anton Ignatov 2a294c408f Fix due date alignment and chage header structure from bootstrap to flexbox 2019-05-06 16:20:00 +02:00
Mojca Lorber 7be151bd2d Visual fixes for edit/add step on protocol 2019-04-30 14:57:50 +02:00
Anton Ignatov 7c55fcf0cf Merge branch 'master' into master-with-note-section 2019-04-30 12:07:59 +02:00
Miha Mencin 970a9b42ed
Update hilightjs github theme path 2019-04-26 17:29:14 +02:00
Urban Rotnik c94d3ce950 Remove duplicated button 2019-04-26 07:57:46 +02:00
Oleksii Kriuchykhin 66631ba26c Fix loading more activities on task page [SCI-3390] 2019-04-25 23:50:00 +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 88123f5ecd Fix paths for highlightjs-github-theme [SCI-3377] 2019-04-24 12:35:01 +02:00
Urban Rotnik 11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
Oleksii Kriuchykhin 231106e131 Switch to kaminari pagination in global activities [SCI-3292] 2019-04-12 15:37:45 +02:00