scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 17:36:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
1332 commits 69 branches 179 tags 165 MiB
Commit graph

1332 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
okriuchykhin 02bfd19d1c Merge pull request #385 from okriuchykhin/ok_SCI_102 
Fix XSS on activites and throghout the rest of app [SCI-102]
 2017-01-16 11:41:38 +01:00
mlorb 88cc87d168 Merge pull request #408 from mlorb/ml-sci-847-v2 
Adjust columns width in samples table header after selecting sample group [SCI-847]
 2017-01-16 10:52:00 +01:00
Luka Murn a0e9e5afa8 Merge pull request #402 from mz3944/mz-sci-848-v2 
Unable to delete samples [SCI-848]
 2017-01-16 10:47:13 +01:00
Luka Murn 0fd9660eb7 Merge pull request #403 from Ducz0r/lm-sci-876-fix 
Year difference problems with notifications [SCI-876]
 2017-01-14 10:01:38 +01:00
Luka Murn 1acf258c70 Fix minor Zmagohound comment 2017-01-14 10:00:52 +01:00
Mojca Lorber 9f1a49847e fix table header again 2017-01-13 18:54:43 +01:00
Mojca Lorber 5f7e0b2227 adjust columns width in samples table header after selecting sample group 2017-01-13 15:59:47 +01:00
okriuchykhin 1ae5e6f8a7 Merge pull request #406 from okriuchykhin/ok_SCI_855 
Fix compatibility of fixed samples table header and modal-tooltip [SCI-855]
 2017-01-13 15:56:37 +01:00
Oleksii Kriuchykhin a190ef36ff Extend comment to make more clear [SCI-855] 2017-01-13 12:43:43 +01:00
mlorb db4af3fc15 Merge pull request #404 from mlorb/ml-sci-fix-284-881-843 
Fix broken scrolling functionality in samples table [SCI-284-881-843]
 2017-01-13 11:58:55 +01:00
Oleksii Kriuchykhin 097209bd9d Fix compatibility of fixed samples table header and modal-tooltip [SCI-855] 2017-01-13 11:34:05 +01:00
Mojca Lorber bc6fbc5f91 fix hound 2017-01-13 11:18:44 +01:00
Mojca Lorber 4250088447 fix broken scrolling functionality in samples table 2017-01-13 11:07:33 +01:00
Oleksii Kriuchykhin f567d0307e Fix includes [SCI-102] 2017-01-12 17:02:01 +01:00
Oleksii Kriuchykhin 75031e17b9 Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
Oleksii Kriuchykhin 69b65c27f8 Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
Luka Murn bc03a26d4b Also fix this new year issue on comments display 2017-01-12 15:06:12 +01:00
Luka Murn 8b01f912a0 Fix new year problems with activities 
Closes SCI-876.
 2017-01-12 14:47:15 +01:00
Matej Zrimšek 93a8e0bdae Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848] 2017-01-12 14:08:29 +01:00
Oleksii Kriuchykhin 0350f2f792 Add html escaping to name filelds in the views [SCI-102] 2017-01-12 11:03:14 +01:00
Oleksii Kriuchykhin d05c16b0ba Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +01:00
mz3944 aba12b9b2c Merge pull request #401 from mz3944/mz-sci-878 
Protocol repository - user cannot download files
 2017-01-11 16:25:45 +01:00
Oleksii Kriuchykhin 0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +01:00
okriuchykhin 404952336d Merge pull request #400 from okriuchykhin/ok_SCI_846 
Fixes sorting of custom columns in samples datatable [SCI-846]
 2017-01-11 15:34:02 +01:00
mlorb fe1ef97523 Merge pull request #398 from mlorb/ml_sci_843 
Adjust samples tables height when in edit mode selecting sample type/group [SCI-843]
 2017-01-11 15:33:52 +01:00
Mojca Lorber 3a3f20a215 fix bug with different approach 2017-01-11 15:25:10 +01:00
Matej Zrimšek 30a9c283fb Added back bullets to images in protocol preview in protocol repository. 2017-01-11 14:15:07 +01:00
Matej Zrimšek 852dc2eb7e Added file downloading to protocol preview in protocol repository. [SCI-878] 2017-01-11 14:14:12 +01:00
Oleksii Kriuchykhin 094d0f0f71 Fixes sorting of custom columns in samples datatable [SCI-846] 2017-01-11 13:21:38 +01:00
okriuchykhin 8d4b2d7373 Merge pull request #399 from okriuchykhin/ok_SCI_811_v2 
Fix changed sample type and sample group in sample edit [SCI-811]
 2017-01-11 11:37:38 +01:00
mlorb 90e644ddd9 Merge branch 'master' into ml_sci_843 2017-01-11 11:35:41 +01:00
mlorb f0842389b2 Merge pull request #396 from mlorb/ml_sci_851 
Change color of clickable names when row is selected in datatables [SCI-851]
 2017-01-11 11:21:31 +01:00
mlorb b898c792c4 Merge pull request #395 from mlorb/ml_sci_847 
Adjust columns width in table header after selecting sample type/group [SCI-847]
 2017-01-11 10:43:12 +01:00
Oleksii Kriuchykhin a3d9e25feb Fix changed sample type and sample group in sample edit [SCI-811] 2017-01-10 16:51:51 +01:00
Mojca Lorber 577e526fec adjust samples tables height when in edit mode selecting sample type or group 2017-01-10 16:31:20 +01:00
Luka Murn 0cf5afa499 Merge pull request #376 from Ducz0r/lm-sci-813-fix 
Fix search on hidden columns in samples table [SCI-813]
 2017-01-10 11:27:56 +01:00
Luka Murn 05be1e862f Update filter after toggling visibility (if neccesary) 2017-01-10 11:26:12 +01:00
okriuchykhin f8237e025a Merge pull request #394 from okriuchykhin/ok_SCI_853 
Fix non removable error messages in samples [SCI-853]
 2017-01-10 11:00:01 +01:00
Mojca Lorber 510731bd4e change color of clickable nameswhen row is selected in datatables 2017-01-09 15:51:21 +01:00
Mojca Lorber a0a7f35d44 adjust columns width in table header after selecting sample type/group 2017-01-09 15:00:07 +01:00
Oleksii Kriuchykhin 773b00933a Improve multiple messages handling in samples [SCI-853] 2017-01-09 13:55:50 +01:00
Oleksii Kriuchykhin 0fd7688427 Fix hiding of error messages in the samples datatable [SCI-853] 2017-01-09 13:34:23 +01:00
okriuchykhin 3f930ccfce Merge pull request #392 from okriuchykhin/ok_SCI_858 
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
 2017-01-09 12:49:38 +01:00
mz3944 54ef2be94b Merge pull request #383 from mz3944/mz-sci-845 
Fixed samples table all rows un/checking. [SCI-845]
 2017-01-09 11:58:44 +01:00
mz3944 ef431da2db Merge pull request #389 from mz3944/mz-sci-848 
Unable to delete samples [SCI-848]
 2017-01-09 11:57:48 +01:00
okriuchykhin 3c47d17019 Merge pull request #386 from okriuchykhin/ok_SCI_815 
Improve error message when importing CSV files with incorrect character encoding [SCI-815]
 2017-01-09 11:54:28 +01:00
mlorb 006db01b11 Merge pull request #390 from mlorb/ml_sci_850 
Fix samples info popup error [SCI-850]
 2017-01-09 11:38:50 +01:00
mlorb f14ad0f762 Merge pull request #387 from mlorb/ml_sci_732 
Add protocol preview to search results [SCI-732]
 2017-01-09 11:28:04 +01:00
Oleksii Kriuchykhin bc8db28746 Fixes wrong samples info modals being shown in samples datatable [SCI-858] 2017-01-09 09:38:42 +01:00
Matej Zrimšek 72df48500d Fixed samples table all rows un/checking. [SCI-845] 2017-01-06 18:19:20 +01:00