Commit graph

1308 commits

Author SHA1 Message Date
Jure Grabnar
477e41a96d Refactor I18n strings for tiny_mce 2019-09-30 11:34:39 +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
Luka Murn
39b3868680
Merge pull request #2093 from Ducz0r/lm-active-mailer-config-minor-changes
ActiveMailer minor config changes
2019-09-27 10:17:05 +02:00
Luka Murn
a552356bfe Minor comment text update 2019-09-25 13:16:16 +02:00
Luka Murn
093c6e37bc Minor restructure/comment changes to ActionMailer config 2019-09-25 11:58:52 +02:00
Mojca Lorber
47ccf38662 Redesign of sorting button for projects/experiments cards 2019-09-16 14:43:12 +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
Oleksii Kriuchykhin
265047caf3 Improve behaviour of inventory items export modal [SCI-3815] 2019-09-09 10:38:47 +02:00
Miha Mencin
12d6804263
Merge pull request #2034 from biosistemika/SCI3818-unshared-inventory-screen
SCI-3818-unshared-inventory-screen
2019-09-09 09:30:34 +02:00
Miha Mencin
d522b3807a codestyle improvements 2019-09-06 14:59:30 +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
Oleksii Kriuchykhin
c65c0cf356 Make previewable document filter more strict [SCI-3817] 2019-09-04 10:39:04 +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
Oleksii Kriuchykhin
267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +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
b850efbceb Code review remarks, added tooltip for unshared inventory 2019-08-26 10:45:40 +02:00
Luka Murn
084cdcdd6b Remove old archive endpoint, controller logic 2019-08-21 13:17:19 +02:00
Luka Murn
2db39c049e Remove projects archive page 2019-08-21 13:10:54 +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
Urban Rotnik
ef528ccdc6 Fix translation for view only permission 2019-08-19 09:51:28 +02:00
aignatov-bio
d4aedbb35f
Small ux changes for inventories (#1989) 2019-08-19 09:24:10 +02:00
Urban Rotnik
89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
Miha Mencin
d1ecdedd59 SCI-3768 remove .freeze from multiple constants 2019-08-12 22:31:47 +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
32783576c1 Add controller action 'multiple_update'
Add controller action, add update permission activity, add JS for handling ajax req
2019-08-09 14:15:50 +02:00
Urban Rotnik
2648521924 Invite modal with form 2019-08-09 14:15:49 +02:00
Urban Rotnik
466b05a5bc Update repository index page 2019-08-09 14:15:48 +02:00
Urban Rotnik
171cdb319b Add ShareInventory activities 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
Urban Rotnik
5456c1e38a Add basic controller for TeamRepositories 2019-08-09 14:12:59 +02:00
Urban Rotnik
f569411bc7 Add TeamRepository model 2019-08-09 14:12:59 +02:00
Urban Rotnik
1b9db2f61e Fix for file annotating on Safari 2019-07-24 14:16:29 +02:00
Miha Mencin
bbf6b709bc
Merge pull request #1936 from jbargu/jg_sci_3696
[SCI-3696] Small email template styling fixes
2019-07-15 13:26:59 +02:00
Jure Grabnar
48c6b9ae91 Fix typo
Fix SCI-3696
2019-07-15 11:30:59 +02:00
Jure Grabnar
a372d4056d Add last_published protocols.io endpoint 2019-07-14 19:24:53 +02:00
Urban Rotnik
5cf100a787 Show 'published_on' instead of 'created_on' on external_protocols list 2019-07-12 16:56:07 +02:00
Miha Mencin
d4b09444b2
Merge pull request #1917 from biosistemika/SCI-3672-replace-button-title
SCI-3672 Replace Talk to us button link
2019-07-12 16:18:32 +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
aignatov-bio
4bae87e3f7
Styling changes in DOCX report [SCI-3633] (#1899)
* Styling changes in DOCX report

* Update result comments in docx report

* Fix markup
2019-07-12 13:48:14 +02:00
aignatov-bio
26ef970a1e
Add academy button (#1924) 2019-07-12 11:15:34 +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
Miha Mencin
f8ea51f7d6 SCI-3672 change the copy of the import button 2019-07-10 14:24:17 +02:00
Urban Rotnik
0ee2afae29
Merge pull request #1913 from urbanrotnik/ur-sci-3657-log-errors
Log to console when error occur on ProtocolsImport actions [SCI-3657]
2019-07-10 09:01:01 +02:00
Urban Rotnik
cc3cd43270 Log to console when error occur on ProtocolsImport actions 2019-07-09 15:32:43 +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
1a75a31647
Remove webinar button [SCI-3664] (#1906)
* Remove webinar button

* Remove constants and i18n
2019-07-09 14:01:09 +02:00