scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-12 20:24:43 +08:00
Code Issues Projects Releases Packages Wiki Activity
6640 commits 30 branches 180 tags 166 MiB
Commit graph

738 commits

Author SHA1 Message Date
Urban Rotnik
9397705033 Fix positions of CoSign and Unlock buttons 2019-09-30 13:39:23 +02:00
Urban Rotnik
b13c429d26 SystemNotifications count position fixed 2019-09-30 13:12:35 +02:00
Urban Rotnik
dfafd4767c Fix Protocol buttons group 
[SCI-3929]
 2019-09-30 11:51:37 +02:00
Jure Grabnar
b286e4adfd Fix styles for notification bar 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
mlorb
594124dad6
Merge pull request #2053 from mlorb/ml-sci-3637 
Redesign of sorting button for projects/experiments cards [SCI-3637]
 2019-09-27 12:44:44 +02:00
Jure Grabnar
0c24210f6a
[SCI-3784] Small RTF improvements (#2061) 
[SCI-3784] Small RTF improvements
 2019-09-27 10:27:57 +02:00
mlorb
e3b0e149b6
Merge pull request #2077 from mlorb/ml-sci-3764 
Expand clickable area of links in secondary navigation [SCI-3764]
 2019-09-27 10:15:12 +02:00
Anton Ignatov
e01c438055 Fix padding for marvinjs modal 2019-09-24 11:02:15 +02:00
Mojca Lorber
a85c80d994 Fix bug with inventory navigation height 2019-09-23 16:12:41 +02:00
Mojca Lorber
9f30e05594 Expand clickable area of links in secondary navigation 2019-09-23 14:34:48 +02:00
aignatov-bio
11f6517d0a
Fix duplicate marvinjs save (#2057) 2019-09-18 11:18:44 +02:00
aignatov-bio
52499fa285
Fix pathe to icon for chemical structure (#2056) 2019-09-18 11:18:31 +02:00
Jure Grabnar
40aa1a37a2 Change colors of active buttons TinyMCE 
Close SCI-3784
 2019-09-17 15:45:27 +02:00
Mojca Lorber
47ccf38662 Redesign of sorting button for projects/experiments cards 2019-09-16 14:43:12 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
aignatov-bio
40b5b2406b
Fix big inventory names (#2046) 2019-09-11 15:44:38 +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
aignatov-bio
481be7b92e
Fix padding to share modal (#2024) 2019-09-03 12:06:16 +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
aignatov-bio
d209b3abcd
Update share modal window [SCI-3812] (#2018) 
* Update share modal window

* Fix markup
 2019-08-29 13:45:27 +02:00
Miha Mencin
0058198bb5
Merge branch 'master' into SCI-3806-shared-status-dropdown 2019-08-26 11:55:25 +02:00
mlorb
ffe06d5070
Merge pull request #2010 from mlorb/ml-sci-3805 
Add a team name to inventory item card [SCI-3805]
 2019-08-26 11:29:12 +02:00
aignatov-bio
b3e3c443f0
Fix big gap in title of navbar (#2015) 2019-08-26 11:20:03 +02:00
Miha Mencin
9e9e698778 SCI-3806 Add an icon indicating shared status to dropdown 2019-08-26 09:14:37 +02:00
Mojca Lorber
50c78f182c Add a team name to inventory item card 2019-08-23 11:13:58 +02:00
aignatov-bio
d70b7e2272
Make share status icon dynamic (#2007) 2019-08-21 15:32:57 +02:00
aignatov-bio
f94b8165dc
Fix marvinjs edit button and icon (#1985) 2019-08-21 11:15:57 +02:00
aignatov-bio
4730e7bfee
Change notification counter position (#2000) 2019-08-21 10:39:56 +02:00
aignatov-bio
0b85dcbead
Fix long inventory names (#1999) 2019-08-21 10:39:48 +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
2cf7f52f15
Add inline editing for inventories [SCI-3763] (#1991) 
* Add inline editing for inventories

* Remove old locals

* Markup fix
 2019-08-19 13:30:56 +02:00
aignatov-bio
d4aedbb35f
Small ux changes for inventories (#1989) 2019-08-19 09:24:10 +02:00
Miha Mencin
5adb745743
Merge pull request #1987 from aignatov-bio/ai-sci-3785-fix-assign-unassing-buttons 
Fix assign/unassign buttons [SCI-3785]
 2019-08-19 08:51:14 +02:00
Anton Ignatov
ec57e0aa91 Fix assign/unassign buttons 2019-08-16 10:05:01 +02:00
aignatov-bio
737f9e572c
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) 
* Replace marvinJS logo and fix some merge issues

* Fix tests
 2019-08-13 11:04:19 +02:00
aignatov-bio
aad726ac40
Update CSS for share modal (#1978) 2019-08-12 15:02:16 +02:00
Urban Rotnik
d04b0ccff1 Move '+ new inventory' link above list in sidebar 2019-08-09 14:15:51 +02:00
Urban Rotnik
7719b825e3 Update wording for sharing activities, rename button, add view-only paragraph 2019-08-09 14:15:51 +02:00
Urban Rotnik
466b05a5bc Update repository index page 2019-08-09 14:15:48 +02:00
Mojca Lorber
26bd81621f Add new icons also to the inventories list in navigation 2019-08-09 14:13:02 +02:00
Mojca Lorber
7d4941015f Update global search, so it will be able to search through shared inventories 2019-08-09 14:13:01 +02:00
Mojca Lorber
15432ac851 Make changes to inventory list in navigation based on new mockup 2019-08-09 14:13:00 +02:00
Mojca Lorber
cac7dab440 Show shared inventories in left navigation and fix read repository permission 2019-08-09 14:13:00 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
aignatov-bio
aa5061a1af
Add custom context menu to TinyMCE images [SCI-3582] (#1944) 
* Add custom context menu to TinyMCE images

* Fix permission check for unsaved objects

* Fix markup
 2019-08-07 10:28:42 +02:00
Oleksii Kriuchykhin
eaf9d59819 Merge branch 'activestorage_migration' into ok_SCI_3679 2019-08-06 15:27:31 +02:00
Jure Grabnar
b12403b769 Add comment name fix as Urban suggested 2019-07-31 09:23:22 +02:00
Oleksii Kriuchykhin
5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Jure Grabnar
39fbd18316 Remove width on commments 
Closes SCI-3674
 2019-07-25 16:46:27 +02:00
Anton Ignatov
03a45d7dd8 Fix markup 2019-07-16 13:42:39 +02:00
Anton Ignatov
1e8663548e Add MarvinJS assets to TinyMCE 2019-07-16 13:40:54 +02:00
Anton Ignatov
3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
aignatov-bio
a8623002e6
Small UI changes [SCI-3699] (#1935) 
* Small ui changes

* Markup fix

* Add class for addons
 2019-07-15 13:28:20 +02:00
aignatov-bio
894e201e1b
Fix big file issue in step attachments [SCI-3682] (#1919) 
* Fix big file issue in step atachments

* Fix markup
 2019-07-15 11:00:01 +02:00
mlorb
5bc8eb7392
Merge pull request #1921 from mlorb/ml-sci-3641 
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
 2019-07-12 15:52:40 +02:00
Anton Ignatov
7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +02:00
aignatov-bio
26ef970a1e
Add academy button (#1924) 2019-07-12 11:15:34 +02:00
Urban Rotnik
d5fbe5ecd7 Fix for safari on external protocols tab 2019-07-11 11:53:49 +02:00
Mojca Lorber
f8afc92606 Fix page redirect and add success flash msg after protocols.io import action 2019-07-11 09:50:39 +02:00
Oleksii Kriuchykhin
64b7a5646a Implement custom document file previewer [SCI-3677] 2019-07-10 14:37:23 +02:00
aignatov-bio
7ac410e573
Fix visual bugs across ProtocolIo [SCI-3671] (#1914) 
* Fix visual bugs across ProtocolIo
 2019-07-10 13:00:32 +02:00
mlorb
23270393b0
Merge branch 'master' into ml-sci-3634 2019-07-09 14:38:00 +02:00
Mojca Lorber
7bb82e2fc2 Fix eternal protocols tab visuals 2019-07-09 14:35:40 +02:00
aignatov-bio
fc78d8f401
Fix tooltip position (#1909) 2019-07-09 14:00:53 +02:00
aignatov-bio
01a01157d3
Replace Handson table in reports with simple table [SCI-3636] (#1895) 
* Replace handsone table in reports with simple table

* Add result tables
 2019-07-08 13:19:12 +02:00
Jure Grabnar
ae7da78bff
Merge pull request #1897 from jbargu/jg_sci_3646 
[SCI-3646] Add paging functionality to external protocols
 2019-07-08 13:06:19 +02:00
aignatov-bio
6d423ed986
Make Navbar icons bigger [SCI-3663] (#1900) 
* Make Navbar icons bigger
 2019-07-08 12:53:43 +02:00
Mojca Lorber
989c10872c Fixes visual bugs on protocols.io and home page 2019-07-04 18:22:51 +02:00
Jure Grabnar
dc7fee51fa Add Show more protocols functionality to external protocols 
Closes SCI-3646
 2019-07-04 15:35:18 +02:00
Jure Grabnar
20134c9f8a
Features/protocolsio integration (#1893) 
Features/protocolsio integration
 2019-07-03 17:32:20 +02:00
Miha Mencin
669592f62c
Merge pull request #1886 from biosistemika/SCI-3640-fix-safari-search-bar 
SCI-3640 Search line on Safari external protocols page needs update
 2019-07-03 14:18:02 +02:00
Miha Mencin
1b31f7f30a SCI-3640 set max width of search bar to 50% 2019-07-03 13:16:07 +02:00
Miha Mencin
37cc526ac9 fix CR comments 2019-07-03 10:22:59 +02:00
Miha Mencin
74b4e0d774 SCI-3644 hide the import button and show it only on hover & when appropriate user 2019-07-02 18:24:07 +02:00
aignatov-bio
2793777463
Features/docx report (#1873) 
* Initial setup for docx report

* Add render for project, experiment, my_module

* Implement converter for RTE fields

* Add all report elements

* fix markup

* Change headers, remove empty blocks, refactored repository draw

* Add smart annotations support

* Fix justify fields

* Prepare for addons integration

* Fix markup

* Add comments to GemFile

* Fix TinyMCE error

* Change UI for new report download selector

* Fix file error in inventory cell for docx

* Fix i18n object for header
 2019-07-01 10:14:16 +02:00
Jure Grabnar
ebbb36cc6d Remove border from the import button 2019-06-28 11:32:47 +02:00
Anton Ignatov
6be227b2d3 Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-06-28 10:47:38 +02:00
Jure Grabnar
5430fb311d Hound fixes 2019-06-28 10:41:20 +02:00
Jure Grabnar
1ccabf62b3 Add preview banner in external protocols 2019-06-28 01:38:33 +02:00
Jure Grabnar
81695665c7 Add hover effect on the card 2019-06-28 00:47:08 +02:00
Jure Grabnar
d3afcbed50 Style card view on external protocols 
Closes SCI-3535
 2019-06-28 00:43:05 +02:00
Jure Grabnar
0a77cedaf8 Fix sorting of external protocols and start showing results 2019-06-27 22:48:56 +02:00
Jure Grabnar
8338892fc6 Update external protocols form to include sort_by 2019-06-27 21:26:28 +02:00
Urban Rotnik
9cb4454537 New implementation for attachments creation 2019-06-27 17:02:06 +02:00
Urban Rotnik
2761079479 Add modal for import 2019-06-27 16:46:02 +02:00
Anton Ignatov
31c6802a06 Add support for marvinjs on service 2019-06-23 00:09:49 +02:00
Anton Ignatov
7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
Anton Ignatov
dfece85ea1 Fix handsone table 2019-06-21 11:16:44 +02:00
Jure Grabnar
b2b752fcf8 Fix hound complaints 2019-06-19 23:37:04 +02:00
Jure Grabnar
fcd42a4178 Fix border radius around active sort button 2019-06-19 22:59:30 +02:00
Jure Grabnar
b3c3b68dc2 Add external preview to External Protocols tab 
Closes SCI-3563
 2019-06-19 22:54:20 +02:00
aignatov-bio
83b9efd7dd Fix right floating images in RTE editor (#1842) 2019-06-19 14:06:33 +02:00
Jure Grabnar
7adef9cc9e Change sort buttons positions 
Closes SCI-3534
 2019-06-17 12:24:13 +02:00
Jure Grabnar
218cf84775 Hound fixes 2019-06-17 12:24:12 +02:00
Jure Grabnar
d103f8ffec Finish external protocols screen 
Closes SCI-3534
 2019-06-17 12:24:12 +02:00
aignatov-bio
2dfbdacfa3
Change restore button background (#1829) 2019-06-14 16:21:01 +02:00
aignatov-bio
da8d748c49
Fix small comments bugs (#1832) 2019-06-14 16:20:47 +02:00
aignatov-bio
7a3eedf461
Adding missing avatars to comments (#1838) 2019-06-14 16:20:13 +02:00