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

1790 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zmagod d331911ffe completed step annotations 2017-04-06 08:42:16 +02:00
zmagod 99c116f257 first run 2017-04-04 09:19:43 +02:00
mlorb 317739af1e Merge pull request #530 from biosistemika/ml_sci_1044 
Add data-hook and yadcf-filter plug-in [SCI-1044]
 2017-03-31 14:00:23 +02:00
Mojca Lorber a2c1ed6994 fix constants 2017-03-31 13:53:18 +02:00
Mojca Lorber 6a4faf8765 add color constants 2017-03-31 13:24:08 +02:00
Mojca Lorber 503ee5b62e change place of data-hook 2017-03-30 17:21:29 +02:00
okriuchykhin ff919eba92 Merge pull request #531 from okriuchykhin/ok_SCI_1127 
Remove logs table and old unused logging code [SCI-1127]
 2017-03-30 13:50:58 +02:00
Oleksii Kriuchykhin 42ccefe2ce Remove logs table and old unused logging code [SCI-1127] 2017-03-30 11:47:57 +02:00
okriuchykhin d39940efea Merge pull request #526 from okriuchykhin/ok_SCI_1096 
Add docker files for running in production mode [SCI-1096]
 2017-03-30 10:40:50 +02:00
Oleksii Kriuchykhin 982612a61a Add additional targets to Makefile and optimize docker files [SCI-1096] 2017-03-29 16:00:11 +02:00
Mojca Lorber 9458f391e5 add data-hook and yadcf-filter plug-in 2017-03-29 15:59:51 +02:00
Zmago Devetak 2b35b34eb8 Merge pull request #529 from ZmagoD/zd_SCI_1135 
fixes alert messages in samples [fixes SCI-1135]
 2017-03-29 14:57:11 +02:00
Zmago Devetak 0019fd19ea Merge pull request #525 from ZmagoD/zd_SCI_765 
Export large files - utility class
 2017-03-29 11:55:51 +02:00
zmagod 0096f9dc14 refactor 2017-03-29 09:32:23 +02:00
okriuchykhin 05a49e5a82 Merge pull request #528 from okriuchykhin/ok_SCI_1133 
Fix secondary navigation on Mac [SCI-1133]
 2017-03-29 09:30:34 +02:00
Zmago Devetak 583ac1bf74 Merge pull request #527 from ZmagoD/zd_SCI_1136 
add hook to canvas module actions
 2017-03-28 15:18:17 +02:00
zmagod 9ce95470b3 fixes alert messages in samples [fixes SCI-1135] 2017-03-28 15:14:05 +02:00
Oleksii Kriuchykhin 391c5af267 Fix secondary navigation on Mac [SCI-1133] 2017-03-28 14:36:52 +02:00
zmagod 7039420f99 add hook to canvas module actions 2017-03-28 10:43:39 +02:00
Oleksii Kriuchykhin 29621781d6 Add caching of gems [SCI-1096] 2017-03-27 21:04:47 +02:00
Oleksii Kriuchykhin a7be37ef67 Add docker files for running in production mode [SCI-1096] 2017-03-27 14:36:20 +02:00
zmagod 0996c14449 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765 2017-03-27 10:41:58 +02:00
zmagod 2235fd3fb7 adds view if download expires 2017-03-27 10:38:28 +02:00
zmagod 9aeefbdf96 adds rake task to destroy ZipExports 2017-03-27 10:02:47 +02:00
mlorb 3beb179f87 Merge pull request #514 from biosistemika/ml_sci_1089 
Add error messages to sample group/type edit/delete actions [SCI-1089]
 2017-03-27 09:57:32 +02:00
Zmago Devetak 3b82a8b9b2 Merge pull request #500 from ZmagoD/zd_SCI_1003_add_extends 
adds enum extends to report element part of SCI-1003
 2017-03-24 16:35:15 +01:00
zmagod 239a44c26b change send to public_send 2017-03-24 16:25:50 +01:00
zmagod 4635a3320d Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-24 16:09:28 +01:00
okriuchykhin 71dc6921fb Merge pull request #524 from okriuchykhin/ok_SCI_1046 
Add team_id field to assets and tables [SCI-1046]
 2017-03-24 14:48:16 +01:00
Oleksii Kriuchykhin d2c8e9a395 Set team for assets and tables in generators [SCI-1046] 2017-03-24 14:46:20 +01:00
Zmago Devetak 804fb2fec9 Merge pull request #519 from ZmagoD/zd_SCI_1092_v2 
adds hooks in team switch [fixes SCI-1092]
 2017-03-24 12:56:52 +01:00
zmagod b352ef1600 removed unneeded method 2017-03-24 12:53:33 +01:00
zmagod f380e08ab0 fixed hound 2017-03-24 12:42:50 +01:00
zmagod 023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
zmagod 94732c6d18 adds delayed zip generator 2017-03-23 15:45:02 +01:00
Luka Murn 541998bde6 Bump version to 1.9.0 2017-03-23 14:37:47 +01:00
Oleksii Kriuchykhin 2edebb282a Add team_id field to assets and tables [SCI-1046] 2017-03-23 10:36:55 +01:00
Luka Murn ee65e46fc7 Remove 'nokogiri' Gem being included twice 2017-03-22 10:37:11 +01:00
zmagod 4385c68f5f adds zip_export utility first run 2017-03-21 16:15:11 +01:00
okriuchykhin 276ce45a6c Merge pull request #523 from okriuchykhin/ok_SCI_1125 
Add missing translation for protocol load [SCI-1125]
 2017-03-21 15:20:25 +01:00
Oleksii Kriuchykhin 8a8720fcfe Add missing translation for protocol load [SCI-1125] 2017-03-21 15:07:59 +01:00
okriuchykhin 33544ec91d Merge pull request #521 from okriuchykhin/ok_SCI_1087 
Move flash message creation JS code to helper method [SCI-1087]
 2017-03-20 15:35:21 +01:00
Zmago Devetak 38299d9f67 Merge pull request #522 from ZmagoD/zd_SCI_1111 
fixes breadcrumbs in office file [fixes SCI-1111]
 2017-03-20 13:53:29 +01:00
Zmago Devetak 75fa11622e Merge pull request #520 from ZmagoD/zd_SCI_1100_v2 
fixed report comments bug [fixes SCI-1100]
 2017-03-20 13:51:17 +01:00
zmagod d8955d1a78 fixes breadcrumbs in office file [fixes SCI-1111] 2017-03-20 13:48:45 +01:00
Oleksii Kriuchykhin c715902058 Move flash message creation JS code to helper method [SCI-1087] 2017-03-17 17:58:53 +01:00
Mojca Lorber 83fa8570d7 refactoring 2017-03-17 17:52:15 +01:00
zmagod c244e69e81 fixed report comments bug [fixes SCI-1100] 2017-03-17 16:59:40 +01:00
Zmago Devetak 9a75411cbd Merge pull request #517 from ZmagoD/zd_SCI_1110 
fixed wopi buttons [fixes SCI-1110]
 2017-03-17 16:50:24 +01:00
zmagod 5cc6cd094e refactor 2017-03-17 16:47:58 +01:00