scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-30 11:56:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
6126 commits 69 branches 179 tags 165 MiB
Commit graph

6126 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mlorb 2fd9345616
Merge pull request #2068 from mlorb/ml-sci-3816 
Fix reloading of datatables header [SCI-3816]
 2019-09-27 10:29:32 +02:00
Jure Grabnar 0c24210f6a
[SCI-3784] Small RTF improvements (#2061) 
[SCI-3784] Small RTF improvements
 2019-09-27 10:27:57 +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
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
mlorb 495d57b607
Merge pull request #2078 from mlorb/ml-sci-3906 
Fix bug with inventory navigation height [SCI-3906]
 2019-09-27 10:14:25 +02:00
mlorb 246634dbc4
Merge pull request #2069 from mlorb/ml-sci-3796 
Fix inventory item selection when previewing file [SCI-3796]
 2019-09-27 10:13:35 +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
Jure Grabnar 37abc992f7
Merge pull request #2084 from jbargu/jg_sci_3821 
Add tables functionality in tinymce
 2019-09-24 12:45:19 +02:00
Jure Grabnar ae83ef749f Add tables functionality in tinymce 
Close SCI-3821
 2019-09-24 12:44:00 +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
Mojca Lorber 4263edf0cc Fix inventory item selection when previewing file 2019-09-18 15:08:40 +02:00
Mojca Lorber 4d4a275c0d Fix reloading of datatables header 2019-09-18 14:28:29 +02:00
Jure Grabnar 40aa1a37a2 Change colors of active buttons TinyMCE 
Close SCI-3784
 2019-09-17 15:45:27 +02:00
Alex Kriuchykhin 7f415a551d
Merge pull request #2050 from okriuchykhin/release_1_16_10 
Bump version to 1.16.10
 2019-09-12 10:48:52 +02:00
Oleksii Kriuchykhin 816d48f0e0 Bump version to 1.16.10 2019-09-12 10:47:54 +02:00
aignatov-bio c4e8e8ed07
Revert "Fix formulas in project export (#2047)" (#2049) 
This reverts commit 36ae7d05f9.
 2019-09-12 10:45:43 +02:00
aignatov-bio 36ae7d05f9
Fix formulas in project export (#2047) 2019-09-12 08:43:59 +02:00
aignatov-bio 07b9091e23
Fix html escape in unshared warning (#2048) 2019-09-11 16:33:31 +02:00
aignatov-bio 40b5b2406b
Fix big inventory names (#2046) 2019-09-11 15:44:38 +02:00
aignatov-bio 27104a495c
Fix styling for unshared warning message (#2044) 2019-09-11 11:50:02 +02:00
Luka Murn d39d2e1cac
Merge pull request #2045 from Ducz0r/lm-update-canaid-reference 
Update canaid Gem reference in Gemfile to use tags, not master
 2019-09-11 10:39:35 +02:00
Luka Murn 82248a6d92 Update canaid Gem reference in Gemfile to use tags, not master 2019-09-10 18:04:04 +02:00
mlorb cf8c98dfa3
Merge pull request #2042 from biosistemika/hotfix-september 
Hotfix september
 2019-09-10 13:53:28 +02:00
mlorb e596afa595
Merge pull request #2041 from mlorb/ml-sci-3847 
Fix missing icon on shared inventories in global search [SCI-3847]
 2019-09-10 13:51:58 +02:00
aignatov-bio 1f12a63a25
Fix counter on task inventory and failing test (#2043) 2019-09-10 13:51:37 +02:00
Mojca Lorber e8f24b18e2 Fix missing icon on shared inventories in global search 2019-09-10 11:20:18 +02:00
Miha Mencin 33d495956e
Merge pull request #2040 from biosistemika/SCI3818-unshared-inventory-screen 
adding missing file
 2019-09-09 16:47:47 +02:00
Miha Mencin 01628e1efc adding missing file 2019-09-09 16:46:51 +02:00
aignatov-bio 01d6a17f2b
Fix permission check for inventory (#2039) 2019-09-09 15:11:18 +02:00
Alex Kriuchykhin 6a17667d39
Merge pull request #2023 from okriuchykhin/ok_SCI_3726 
Update trim_html_tags Postgres function [SCI-3726]
 2019-09-09 11:18:57 +02:00
Alex Kriuchykhin b8a5b1b542
Merge pull request #2036 from okriuchykhin/ok_SCI_3815 
Improve behavior of inventory items export modal [SCI-3815]
 2019-09-09 11:08:02 +02:00
Alex Kriuchykhin 1714212630
Merge pull request #2035 from okriuchykhin/ok_SCI_3827 
Add local sorting for ProtocolsIO [SCI-3827]
 2019-09-09 10:55:22 +02:00
aignatov-bio 16ae00782a
Fix new step button on empty task [SCI-3826] (#2026) 
* Fix new step button on empty task

* Fix markup
 2019-09-09 10:43:38 +02:00
aignatov-bio fdce4e6c7c
Remove link to archived project page (#2037) 2019-09-09 10:43:08 +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
mlorb f6b9371649
Merge pull request #2038 from mlorb/ml-sci-update_version 
Update version to 1.16.9
 2019-09-06 15:15:58 +02:00
Mojca Lorber adcd55b4aa Update version to 1.16.9 2019-09-06 15:12:27 +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
Oleksii Kriuchykhin 6f7ef25514 Add local sorting for ProtocolsIO [SCI-3827] 2019-09-05 14:49:16 +02:00
Miha Mencin 2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +02:00
Luka Murn e719ba48a7
Merge pull request #2033 from Ducz0r/lm-fix-api-typos 
Minor typo fix in RSpec tests
 2019-09-05 11:33:32 +02:00
Luka Murn bff4029e8d Minor typo fix in tests 2019-09-05 11:13:01 +02:00
aignatov-bio 15dc25cee9
Fix handson table initialization [SCI-3749] (#2021) 
* Fix handson table initialization

* Fix markup
 2019-09-05 08:35:28 +02:00
aignatov-bio b8e68e02a1
Fix error, when cancel tag editing (#2025) 2019-09-05 08:34:33 +02:00
Alex Kriuchykhin 77a1df0068
Merge pull request #2028 from okriuchykhin/ok_SCI_3817 
Make previewable document filter more strict [SCI-3817]
 2019-09-04 15:40:01 +02:00
mlorb f5c8680f22
Merge pull request #2031 from mlorb/ml-sci-3819 
Fix bug on API endpoint when creating result [SCI-3819]
 2019-09-04 14:16:33 +02:00