scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 07:26:20 +08:00
Code Issues Projects Releases Packages Wiki Activity
1360 commits 43 branches 185 tags 169 MiB
Commit graph

309 commits

Author SHA1 Message Date
Mojca Lorber
b3c423c582 add table name in protocol step 2017-01-18 14:22:18 +01:00
Luka Murn
cf72da5635 Merge branch 'improved-files-handling' into 'master' 
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
 2017-01-18 11:29:40 +01:00
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
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
Oleksii Kriuchykhin
f567d0307e Fix includes [SCI-102] 2017-01-12 17:02:01 +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
d05c16b0ba Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin
0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +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
Oleksii Kriuchykhin
89710d8782 Enable image preview for newly uploaded images [SCI-694] 2017-01-06 16:41:24 +01:00
Oleksii Kriuchykhin
aa2b573278 Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +01:00
Matej Zrimšek
ec7a1cb4c0 Replaced remaining related hard-coded names with constants and generalized delete samples name fetching. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
Matej Zrimšek
5d104981fd Fixed sample deletion on experiments level. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
Luka Murn
3cdd375a2d Merge pull request #388 from biosistemika/hotfix-1.6.1 
Hotfix 1.6.1
 2017-01-06 11:23:16 +01:00
Oleksii Kriuchykhin
cba064dfcc Improve error message whan importing CSV files with incorrect character encoding [SCI-815] 2017-01-05 17:00:21 +01:00
Luka Murn
ef688feb4e Hotfix 1.6.1 
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
 2017-01-05 15:27:18 +01:00
Oleksii Kriuchykhin
835e982292 SAnitize AJAX calls in controllers and datatables [SCI-102] 2017-01-05 13:12:22 +01:00
Oleksii Kriuchykhin
cd3924afd3 Sanitize .html_safe marked strings which contain tags [SCI-102] 2017-01-05 13:04:19 +01:00
mlorb
59751ec41e Merge pull request #373 from mlorb/ml_sci_709 
Add Protocol Preview to Protocol repository [SCI-709]
 2017-01-04 11:28:55 +01:00
Luka Murn
cedc6c5074 Merge pull request #382 from Ducz0r/lm-sci-166-fix 
Re-add tags index controller action to render tags [SCI-166]
 2017-01-04 10:48:09 +01:00
Luka Murn
6402acc102 Merge pull request #377 from Ducz0r/lm-sci-820-fix 
Fix 2 bugs with comments editing [SCI-820]
 2017-01-04 10:47:29 +01:00
Mojca Lorber
c476faca30 fix hound 2017-01-03 11:04:09 +01:00
Mojca Lorber
e555535dfb add edit button to protocol preview modal 2017-01-03 10:04:14 +01:00
Luka Murn
af9e272b2a Re-add tags index controller action to render tags 
Closes SCI-166.
 2017-01-03 09:39:41 +01:00
Zmago Devetak
5d0e80a5e1 Merge pull request #369 from ZmagoD/zd_SCI_812 
fixes bug with samples sorting [fixes SCI-812]
 2017-01-03 08:56:59 +01:00
okriuchykhin
cce57d066c Merge pull request #370 from okriuchykhin/ok_SCI_817 
Fix issue with long samples column names in import modal [SCI-817]
 2016-12-30 15:29:32 +01:00
okriuchykhin
e8955b0304 Merge pull request #375 from okriuchykhin/ok_SCI_361 
Add sorting to Project's experiments overview [SCI-361]
 2016-12-30 15:28:53 +01:00
Oleksii Kriuchykhin
d798f1b120 Fix XSS vulnerability in protocol keywords [SCI-632] 2016-12-29 15:15:29 +01:00
Luka Murn
b931b20f02 Fix 2 bugs with comments editing 
Closes SCI-820.
 2016-12-23 20:41:23 +01:00
Oleksii Kriuchykhin
4d3e002c81 Add sorting to Project's experiments overview [SCI-361] 2016-12-23 15:40:01 +01:00
Mojca Lorber
40e3240a99 add content to preview modal 2016-12-22 11:43:11 +01:00
Oleksii Kriuchykhin
53ea09c3de Fix issue with long samples column names in import modal [SCI-817] 2016-12-21 14:34:53 +01:00
zmagod
e2723a288c fixes bug with samples sorting [fixes SCI-812] 2016-12-21 14:32:28 +01:00
Oleksii Kriuchykhin
00ea3a027c Fix generation of preview url for new steps and results [SCI-694] 2016-12-20 16:10:53 +01:00
Oleksii Kriuchykhin
cbef971d85 Fix timeouts when fetching images from S3 [SCI-694] 2016-12-20 15:36:07 +01:00
Oleksii Kriuchykhin
d2b76d8385 Improved image preview modal [SCI-694] 2016-12-19 17:36:18 +01:00
Zmago Devetak
c8631077df Merge pull request #361 from biosistemika/improved-sample-table 
Improved sample table
 2016-12-16 15:37:54 +01:00
zmagod
6d2fb3b02c Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790 2016-12-14 17:05:00 +01:00
okriuchykhin
c4ff12be51 Merge pull request #349 from okriuchykhin/ok_SCI_783 
Fix columns ordering when deleting custom fields [SCI-783]
 2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin
de8eed0a19 Fix hound warning [SCI-783] 2016-12-14 15:27:24 +01:00
Oleksii Kriuchykhin
fa1cf1f04d Better handling of columns deleting with fixing columns ordering [SCI-783] 2016-12-14 15:23:00 +01:00
zmagod
3c1a275510 fixes invited user samples table [fixes SCI-790] 2016-12-13 10:56:13 +01:00
Mojca Lorber
2cfcba0ceb add protocol preview modal 2016-12-13 10:39:18 +01:00
zmagod
4b0e2baa3f fixes breadcrumbs in secondary nav 2016-12-12 16:03:14 +01:00
zmagod
8dd8a7e7cd Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777 2016-12-12 15:52:25 +01:00
zmagod
8bb452e4f7 trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775] 2016-12-12 10:30:03 +01:00
zmagod
de3099e4d1 removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository 2016-12-09 13:59:49 +01:00
Luka Murn
1a8b141b95 Add delete custom field functionality 2016-12-09 13:49:19 +01:00