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

740 commits

Author SHA1 Message Date
zmagod 55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
zmagod 550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
zmagod c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +02:00
okriuchykhin 3d805d529d Merge pull request #554 from okriuchykhin/ok_SCI_877 
Add image preview to protocol repository [SCI-877]
 2017-04-18 08:58:39 +02:00
Zmago Devetak cb1ad9e0be Merge pull request #555 from ZmagoD/zd_SCI_1103 
adds additional explanations [fixes SCI-1103]
 2017-04-13 15:15:08 +02:00
zmagod 0987cf8abc fixes hound alerts 2017-04-13 14:55:18 +02:00
mlorb ddc0e86c92 Merge pull request #556 from mlorb/ml_sci_1174 
Fix bug with changing user own role from admin to normal user [SCI-1174]
 2017-04-13 14:33:58 +02:00
Zmago Devetak ec60044949 Merge pull request #548 from ZmagoD/zd_SCI_1129_v2 
Disables annimateSpiner in result assets actions
 2017-04-13 14:06:50 +02:00
zmagod f104444a0c adds additional explanations [fixes SCI-1103] 2017-04-12 16:56:47 +02:00
Mojca Lorber 27c661d7c4 fix bug with changing user own role from admin to normal user 2017-04-12 16:56:10 +02:00
Oleksii Kriuchykhin 181d981a51 Add image preview to protocol repository [SCI-877] 2017-04-12 16:05:38 +02:00
mlorb 2932052628 Merge pull request #549 from mlorb/ml_sci_1172 
Fix overlapping text in audit trail table [SCI-1172, SCI-1181]
 2017-04-12 15:10:48 +02:00
Mojca Lorber b09c18a9bc fix overlaping text in audit trail table 2017-04-11 14:29:31 +02:00
zmagod 929d8aab5e disables annimateSpiner in result assets actions 2017-04-10 15:40:36 +02:00
Zmago Devetak 91793c295a Merge pull request #542 from ZmagoD/zd_SCI_825 
Smart annotations and Notifications
 2017-04-10 15:10:17 +02:00
Luka Murn becdd687a6 Only require jquery-ui-sortable on samples page 
(hopefully) closes SCI-794.
 2017-04-07 13:05:22 +02:00
okriuchykhin aa776aaa71 Merge pull request #541 from okriuchykhin/ok_SCI_615 
Fix moving of the steps after adding a new one [SCI-615]
 2017-04-06 15:50:01 +02:00
zmagod f16607579f refactor steps annotation 2017-04-06 13:03:13 +02:00
Oleksii Kriuchykhin 5c0197220d Fix moving of the steps after adding a new one [SCI-615] 2017-04-06 12:53:21 +02:00
Mojca Lorber 5e62046627 remove ERROR from message 2017-04-05 14:40:55 +02:00
Mojca Lorber b222a34a97 fix hound 2017-04-04 15:38:16 +02:00
Mojca Lorber 715fafe58c fix bug with constants 2017-04-03 17:07:58 +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 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
zmagod 9ce95470b3 fixes alert messages in samples [fixes SCI-1135] 2017-03-28 15:14:05 +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
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
zmagod 023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +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
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 95a0f596b7 adds file link 2017-03-17 16:40:57 +01:00
zmagod 52878e0989 fixed wopi buttons [fixes SCI-1110] 2017-03-16 15:38:11 +01:00
Mojca Lorber 4792bd87b9 fix error message when editing custom column on locked task 2017-03-15 14:09:44 +01:00
Mojca Lorber 7a4e3201e7 add error messages to sample group/type edit/delete actions 2017-03-14 17:32:25 +01:00
zmagod 7b16e5643e fix assets preprocesor for wopi files 2017-03-13 13:20:49 +01:00
zmagod 0c2523beca Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-03-10 16:21:43 +01:00
Luka Murn 800df7a26b Also make button icons work when rendering them via JS 
Closes SCI-1073.
 2017-03-08 13:55:10 +01:00
Luka Murn 4ddb139911 Fix padding of state buttons 
Closes SCI-1073.
 2017-03-03 16:36:52 +01:00
Luka Murn 42b773f180 Merge pull request #504 from Ducz0r/lm-sci-1078-fix 
Fix sample type groups edit color script [SCI-1078]
 2017-03-02 13:09:51 +01:00
Luka Murn 3599537e42 Fix sample type groups edit color script so it works properly now 
Closes SCI-1078.
 2017-03-01 09:09:44 +01:00
Luka Murn 2252b46afc Canvas should now properly work again 
Closes SCI-1057.
 2017-02-28 10:41:55 +01:00
okriuchykhin 986ad051a1 Merge pull request #496 from okriuchykhin/ok_SCI_873 
Improve image scaling in image preview [SCI-873]
 2017-02-23 09:30:56 +01:00
Oleksii Kriuchykhin cb588ed378 Improve image scaling in image preview [SCI-873] 2017-02-22 16:55:57 +01:00
okriuchykhin d30e149936 Merge pull request #493 from okriuchykhin/ok_SCI_739 
Lower z-index value for notification count icon [SCI-739]
 2017-02-22 16:48:39 +01:00
Oleksii Kriuchykhin a326fa374f Lower z-index value for notification count icon [SCI-739] 2017-02-22 14:35:07 +01:00
Zmago Devetak 58f97fdb5b Merge pull request #489 from ZmagoD/zd_SCI_1002_add_hook 
adds hook for lock task action
 2017-02-22 14:24:01 +01:00
zmagod 151dc79a81 adds hook for lock task action 2017-02-21 16:25:50 +01:00