zmagod
65fa631b1c
adding tinyMce first run
2017-01-18 22:40:08 +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
Zmago Devetak
1b9f7db385
Merge pull request #405 from ZmagoD/zd_SCI_832
...
Visualization of User smart annotation after saving the field
2017-01-18 09:36:42 +01:00
okriuchykhin
781a68e0d5
Merge pull request #415 from okriuchykhin/ok_SCI_888
...
Add missed space in the string [SCI-888]
2017-01-18 09:34:51 +01:00
zmagod
cb0483a6e6
refactor
2017-01-18 08:34:29 +01:00
Oleksii Kriuchykhin
ea8f6a8c6b
Fix issue in report editor [SCI-102]
2017-01-17 14:21:59 +01:00
Oleksii Kriuchykhin
0ce71884a5
Add missed space in the string [SCI-888]
2017-01-16 17:09:41 +01:00
Luka Murn
a2935c6620
Add sample info modal popup to sample smart annotations
...
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').
Closes SCI-892.
2017-01-16 15:52:02 +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
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Luka Murn
8b01f912a0
Fix new year problems with activities
...
Closes SCI-876.
2017-01-12 14:47:15 +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
zmagod
3a1ec0eb5e
refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824]
2017-01-11 14:56:47 +01:00
zmagod
a4aa933151
refactor smart annotation parser helper
2017-01-11 10:34:14 +01:00
zmagod
a903772de8
style dropdown
2017-01-10 17:05:32 +01:00
zmagod
e0e998a0d8
add smart annotation parser helper
2017-01-10 14:14:21 +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
Matej Zrimšek
5d104981fd
Fixed sample deletion on experiments level. Minor refactoring. [SCI-848]
2017-01-06 14:23:20 +01:00
Mojca Lorber
aad2eadeae
syntax fix
2017-01-06 10:46:36 +01:00
Mojca Lorber
4e7e261225
fix protocol preview
2017-01-06 10:10:33 +01:00
Oleksii Kriuchykhin
9987993ce0
Avoid sanitizing of data attributes [SCI-102]
2017-01-05 16:05:48 +01:00
Oleksii Kriuchykhin
1009347026
Add list of whitelisted attributes [SCI-102]
2017-01-05 15:33:41 +01:00
Oleksii Kriuchykhin
0ecb6904d4
Add user input sanitizing in the models [SCI-102]
2017-01-05 13:31:35 +01:00
Oleksii Kriuchykhin
cd3924afd3
Sanitize .html_safe marked strings which contain tags [SCI-102]
2017-01-05 13:04:19 +01:00
Oleksii Kriuchykhin
9c4191a1e0
Initial code commit [SCI-102]
2017-01-05 13:04:19 +01:00
Luka Murn
3bee9d2e12
Save an (yet unworking) version of user smart annotations
...
Used so other devs can start working on smart annotations.
2017-01-04 10:54:02 +01:00
zmagod
a434649f42
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-01-03 16:35:25 +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
zmagod
1ff98bb6df
adds tooltip to samples dropdown and column names
2016-12-14 13:36:10 +01:00
zmagod
9037ab3f48
fixed navigation link
2016-12-14 10:35:48 +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
da630ac2cb
Make edit, delete buttons clickable & hide them if neccesary
2016-12-09 13:18:59 +01:00
zmagod
83aae59eed
adds sample groups index page
2016-12-02 09:33:09 +01:00
Luka Murn
76ec77fce4
Merge pull request #329 from biosistemika/simplify-signup
...
Merge simplify-signup into master
2016-11-30 09:41:20 +01:00
Luka Murn
6491cf1806
Refactor & fix sign up constraints
2016-11-29 16:53:40 +01:00
Luka Murn
b1b095910c
Merge pull request #309 from Ducz0r/lm-remove-unused-files
...
Brace for impact...
2016-11-25 10:00:29 +01:00
Zmago Devetak
341fb13a26
Merge pull request #310 from ZmagoD/zd_add_email_login_constraints
...
adds rake task that creates a sign up email domain constraint
2016-11-23 09:16:24 +01:00
zmagod
d75d58b159
moved email constraint to database_helper
2016-11-23 09:13:09 +01:00
Mojca Lorber
48ac289b6e
put recaptcha in helper method
2016-11-22 17:57:42 +01:00
Luka Murn
595b213b1a
Changes up to samples in views folder
2016-11-19 16:51:40 +01:00
Luka Murn
f5795f5516
Remove unused assets & helpers
2016-11-18 11:30:03 +01:00
Luka Murn
08c6210f7c
Also employ "no format" Nokogiri strategy when sanitizing
...
Closes SCI-691.
2016-11-17 16:43:14 +01:00
Luka Murn
26d04b1f3c
Merge branch 'rich-text-formatting' into 'master'
...
Conflicts:
Gemfile.lock
app/assets/stylesheets/themes/scinote.scss
2016-11-17 16:39:33 +01:00
Luka Murn
a3bbf94643
Add a smart_text_area tag & implement it throughout application
...
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
2016-11-16 17:57:01 +01:00
Mojca Lorber
6f1c9ffb81
refactoring
2016-11-08 11:20:14 +01:00
Mojca Lorber
63eb4eeaf8
fix hound
2016-11-07 15:33:21 +01:00
