scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
9803 commits 77 branches 180 tags 167 MiB
Commit graph

9803 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luka Murn
0ee5b98977 Refactor code a bit, add dismiss button to header 2017-01-07 09:59:52 +01:00
Matej Zrimšek
72df48500d Fixed samples table all rows un/checking. [SCI-845] 2017-01-06 18:19:20 +01:00
Mojca Lorber
6f7c08fa63 fix samples info popup error 2017-01-06 17:31:17 +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
mz3944
1b56e9d07c Merge pull request #384 from mz3944/mz-sci-849 
Fixes experiment button not being clicable in project overview page. …
 2017-01-06 14:26:37 +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
7835753d3c Add atwho-users URL to <body> 2017-01-06 12:48:37 +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
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
Mojca Lorber
356edba1b3 add protocol preview to search results 2017-01-05 18:08:59 +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
488613afcc Add index to users' full name attribute 2017-01-05 16:26:49 +01:00
Oleksii Kriuchykhin
4fe3030ad4 Freeze WHITELISTED_ATTRIBUTES constatnt [SCI-102] 2017-01-05 16:13:00 +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
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
Matej Zrimšek
4b0f47675a Fixes experiment button not being clicable in project overview page. [SCI-849] 2017-01-05 14:42:52 +01:00
Oleksii Kriuchykhin
6487bd788a Add additional whitelisted tags [SCI-102] 2017-01-05 14:40:38 +01:00
Luka Murn
b614ce714b Restyle atwho dropdown 2017-01-05 14:06:48 +01:00
Oleksii Kriuchykhin
0ecb6904d4 Add user input sanitizing in the models [SCI-102] 2017-01-05 13:31:35 +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
Oleksii Kriuchykhin
9c4191a1e0 Initial code commit [SCI-102] 2017-01-05 13:04:19 +01:00
Luka Murn
a78bb79618 Temp commit 2017-01-05 12:07:17 +01:00
Luka Murn
eb64162633 Remove Gem dependency, add atwho as regular vendor/js 2017-01-05 12:06:59 +01:00
Luka Murn
e12907c9b9 Remove original atwho css, apply our own 2017-01-05 10:52:28 +01:00
Luka Murn
09ef3b3ad5 Merge pull request #378 from Ducz0r/lm-sci-802-fix 
Add tooltips to samples column dropdown [SCI-802]
 2017-01-04 11:30:04 +01:00
Luka Murn
2c5b27ce81 Change "Update" to "Save" 
Closes SCI-802.
 2017-01-04 11:29:34 +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
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
Luka Murn
23e60e0d01 Add Gems for smart annotations (atwho) 2017-01-04 10:51: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
zmagod
87ffa7f03b fixes X-WOPI-ServerVersion bug 2017-01-04 10:02:08 +01:00
Luka Murn
37cd6417c8 Merge pull request #374 from Ducz0r/lm-sci-808-814-fix 
Fix some bugs on sample groups & types page [SCI-808, SCI-814]
 2017-01-04 09:50:26 +01:00
Mojca Lorber
fe37ac3b6d fix hound 2 2017-01-03 17:46:30 +01:00
Mojca Lorber
0011474ea3 fix hound 2017-01-03 17:43:55 +01:00
Mojca Lorber
a0704cd873 remove duplicated includes of css and js 2017-01-03 17:33:01 +01:00
zmagod
8cd092b521 update schema 2017-01-03 16:51: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
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
zmagod
01c086b667 fixes routes.rb indentation 2017-01-03 09:49:18 +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
7f99449f63 Merge pull request #371 from okriuchykhin/ok_SCI_819 
Fix an issue with sample editing and type/group dropdowns [SCI-819]
 2016-12-30 15:52:13 +01:00
Oleksii Kriuchykhin
c77c83752e Remove unused css class link-look [SCI-819] 2016-12-30 15:50:43 +01:00