Oleksii Kriuchykhin
|
b234c07c13
|
Fix datatables [SCI-1409]
|
2017-07-03 15:33:50 +02:00 |
|
zmagod
|
311270ff49
|
refactor
|
2017-07-03 15:32:02 +02:00 |
|
zmagod
|
fd13921720
|
fixes repeat tutorial [fixes SCI-1410]
|
2017-06-29 11:00:50 +02:00 |
|
zmagod
|
bef5a085c4
|
Fixes bugs on canvas [fixes SCI-1408]
|
2017-06-29 10:29:41 +02:00 |
|
Oleksii Kriuchykhin
|
e474cda03a
|
Fix activities [SCI-1412]
|
2017-06-28 16:49:50 +02:00 |
|
Zmago Devetak
|
502eb5c211
|
fixes tabs
|
2017-06-28 15:40:15 +02:00 |
|
zmagod
|
d8a3fdea20
|
fixes hound
|
2017-06-28 15:29:10 +02:00 |
|
zmagod
|
525c9770ac
|
fixes experiment page [fixes SCI-1395]
|
2017-06-28 15:21:32 +02:00 |
|
zmagod
|
71aa05bb0e
|
refactor
|
2017-06-27 14:58:49 +02:00 |
|
okriuchykhin
|
d126391940
|
Merge pull request #710 from okriuchykhin/ok_SCI_1356
Add global search in custom repositories [SCI-1356]
|
2017-06-27 13:41:53 +02:00 |
|
Oleksii Kriuchykhin
|
f2f57de264
|
Fix changing protocol ownership logic when removing user from the team [SCI-1415]
|
2017-06-26 15:30:18 +02:00 |
|
Oleksii Kriuchykhin
|
e038bc58fa
|
Add global search in custom repositories [SCI-1356]
|
2017-06-23 16:12:56 +02:00 |
|
zmagod
|
819f47b450
|
setup sciNote for Rails 5.1
|
2017-06-23 15:19:08 +02:00 |
|
zmagod
|
703be13fb0
|
removes imported repository row if the row value is not valid [fixes SCI-1393]
|
2017-06-22 15:21:36 +02:00 |
|
zmagod
|
28129ebb73
|
refactor
|
2017-06-21 17:39:20 +02:00 |
|
zmagod
|
bad52ceff1
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
|
2017-06-21 15:56:07 +02:00 |
|
zmagod
|
18fd5b00ba
|
fix hound
|
2017-06-21 15:01:55 +02:00 |
|
zmagod
|
f66fb49b56
|
adds import records to repositories [fixes SCI-1336]
|
2017-06-21 14:45:50 +02:00 |
|
zmagod
|
f64e1ac713
|
fix locales
|
2017-06-21 09:31:39 +02:00 |
|
Matej Zrimšek
|
6c7987681c
|
Updating repository table state of every user belonging to the team of the repository, when custom column is removed or added. [SCI-1384]
|
2017-06-20 14:52:41 +02:00 |
|
zmagod
|
70fa681519
|
split the import service
|
2017-06-19 14:05:37 +02:00 |
|
Zmago Devetak
|
21577cd0e9
|
Merge pull request #664 from ZmagoD/zd_SCI_1315
removes the delete function of uncompleted steps [fixes SCI-1315]
|
2017-06-13 09:32:26 +02:00 |
|
zmagod
|
a865253a2e
|
first run
|
2017-06-13 08:10:10 +02:00 |
|
Matej Zrimšek
|
e3db79b3cc
|
Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275]
|
2017-06-12 17:49:42 +02:00 |
|
Matej Zrimšek
|
4ea8972a6c
|
Fixed rebasing mistake. [SCI-1275]
|
2017-06-09 19:48:20 +02:00 |
|
rekonder
|
ede744849b
|
Export repository [aj-SCI-1275]
|
2017-06-09 19:44:28 +02:00 |
|
Luka Murn
|
e26337d5ee
|
Merge pull request #671 from biosistemika/custom-repositories
Merge custom-repositories into master
|
2017-06-09 18:46:47 +02:00 |
|
zmagod
|
5f8606c9c5
|
removes the delete function of uncompleted steps [fixes SCI-1315]
|
2017-06-08 14:03:06 +02:00 |
|
Luka Murn
|
810599bef2
|
Fix en.yml localization bug
|
2017-06-08 13:36:37 +02:00 |
|
Luka Murn
|
2ab31aba2f
|
Merge pull request #660 from Ducz0r/lm-sci-1270
Copy repository functionality [SCI-1270]
|
2017-06-08 11:45:57 +02:00 |
|
Luka Murn
|
61eb52f86f
|
Implement GUI for copying repositories
Closes SCI.1270.
|
2017-06-07 19:11:25 +02:00 |
|
Luka Murn
|
b94d2c5c03
|
Implement 'copy' method on Repository object
|
2017-06-07 18:28:07 +02:00 |
|
Luka Murn
|
42f7b4f68d
|
Hound is love, Hound is life
|
2017-06-07 18:22:15 +02:00 |
|
Luka Murn
|
9e45d197df
|
Change some stuff for repos to work, fix some bugs
Closes SCI-1279.
|
2017-06-07 18:07:49 +02:00 |
|
Luka Murn
|
02dd6636ba
|
Allow saving & editing of reports with repository elements
Closes SCI-1279.
|
2017-06-07 16:55:00 +02:00 |
|
Luka Murn
|
b5f6d1da94
|
Allow custom repositories to be added to reports
|
2017-06-07 16:54:32 +02:00 |
|
Luka Murn
|
bb20d2661f
|
Add association between repository rows & my modules
|
2017-06-07 16:54:32 +02:00 |
|
Oleksii Kriuchykhin
|
ad8dd6d740
|
PR fixes [SCI-1274]
|
2017-06-07 15:23:25 +02:00 |
|
Oleksii Kriuchykhin
|
8b1190060e
|
Add custom repository table [SCI-1274]
|
2017-06-07 15:23:25 +02:00 |
|
Matej Zrimšek
|
5aba15e220
|
Made repository names case insensitive. [fix 1269]
|
2017-06-05 10:38:04 +02:00 |
|
zmagod
|
b527afd12b
|
generates samples csv file in background job [fixes SCI-1278]
|
2017-05-29 14:42:55 +02:00 |
|
Oleksii Kriuchykhin
|
e99e3edb7b
|
Add repositories dropdown to task navigation [SCI-1273]
|
2017-05-18 14:21:00 +02:00 |
|
Oleksii Kriuchykhin
|
85e81e9ea2
|
Improve repository models and migration [SCI-1267]
|
2017-05-17 10:04:07 +02:00 |
|
Oleksii Kriuchykhin
|
0dc0c7d096
|
Add validation of text_value length [SCI-1267]
|
2017-05-16 15:57:21 +02:00 |
|
Oleksii Kriuchykhin
|
72a651c7de
|
Add migrations and models for custom repositories [SCI-1267]
|
2017-05-16 15:27:36 +02:00 |
|
okriuchykhin
|
8e523782d9
|
Merge pull request #619 from okriuchykhin/ok_SCI_617
Fixes error when cloning experiments with long names [SCI-617]
|
2017-05-12 16:53:38 +02:00 |
|
okriuchykhin
|
a8bbc3c3ba
|
Merge pull request #615 from okriuchykhin/ok_SCI_1008
Fix task and step ordering in reports [SCI-1008]
|
2017-05-12 16:44:57 +02:00 |
|
Oleksii Kriuchykhin
|
79efb34191
|
Fixes error when clonning experiments with long names [SCI-617]
|
2017-05-12 11:07:11 +02:00 |
|
Oleksii Kriuchykhin
|
bb8c7c342c
|
Add additional info to samples info modal [SCI-960]
|
2017-05-11 22:20:06 +02:00 |
|
Oleksii Kriuchykhin
|
5d55720aad
|
Fix steps ordering in reports [SCI-1008]
|
2017-05-11 15:56:33 +02:00 |
|
Zmago Devetak
|
9911c0d148
|
Merge pull request #613 from ZmagoD/zd_SCI_1241_v3
replace all ActionController::Base.helpers.sanitize calls with custom…
|
2017-05-11 14:30:26 +02:00 |
|
zmagod
|
80a0af8c9f
|
replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]
|
2017-05-11 11:36:47 +02:00 |
|
Oleksii Kriuchykhin
|
a5926726ce
|
Add notifications counter badge to project card [SCI-1253]
|
2017-05-10 17:28:37 +02:00 |
|
zmagod
|
2081e0a94b
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1
|
2017-05-10 15:14:17 +02:00 |
|
Zmago Devetak
|
ff0f85fce8
|
Merge pull request #592 from ZmagoD/zd_SCI_160
removes TempFile after 7 days [fixes SCI-160]
|
2017-05-10 09:32:18 +02:00 |
|
zmagod
|
04ee24d553
|
refactor
|
2017-05-09 14:05:21 +02:00 |
|
zmagod
|
2d69896897
|
fixes pdf export and image size [fixes SCI-1247]
|
2017-05-09 13:59:59 +02:00 |
|
okriuchykhin
|
ccc640f2bc
|
Merge pull request #593 from okriuchykhin/ok_SCI_1158
Add advanced search options [SCI-1158]
|
2017-05-09 10:23:34 +02:00 |
|
Oleksii Kriuchykhin
|
bd5a48b9c8
|
Improve code style [SCI-1158]
|
2017-05-08 18:00:14 +02:00 |
|
Zmago Devetak
|
4b816f5322
|
Merge pull request #568 from ZmagoD/zd_SCI_1119
Add images to fields with rich text formatting
|
2017-05-08 13:06:58 +02:00 |
|
Oleksii Kriuchykhin
|
a3f847a232
|
Fix hound [SCI-1158]
|
2017-05-08 10:22:54 +02:00 |
|
Oleksii Kriuchykhin
|
0ee7e11620
|
Add advanced search options [SCI-1158]
|
2017-05-05 16:41:23 +02:00 |
|
zmagod
|
f079a097c5
|
removes TempFile after 7 days [fixes SCI-160]
|
2017-05-05 14:54:22 +02:00 |
|
zmagod
|
8d0c22327b
|
adds asc order to checklists [fixes SCI-1228]
|
2017-05-04 15:17:34 +02:00 |
|
zmagod
|
acc5594f1b
|
add popup for approval to complete the Task [fixes SCI-1200]
|
2017-05-04 12:41:22 +02:00 |
|
okriuchykhin
|
5ec41c0d0a
|
Merge pull request #576 from okriuchykhin/ok_SCI_763
Add additional sanitization to search parameters in datatables [SCI-763]
|
2017-04-26 13:44:15 +02:00 |
|
zmagod
|
0e383109a1
|
refactor query
|
2017-04-26 13:32:03 +02:00 |
|
Oleksii Kriuchykhin
|
9055894d07
|
Add additional sanitization to search parameters in datatables [SCI-763]
|
2017-04-25 17:37:42 +02:00 |
|
zmagod
|
615bbb9967
|
make search for users case insensitive [fixes SCI-1192]
|
2017-04-25 15:33:51 +02:00 |
|
Luka Murn
|
92159b734f
|
Merge pull request #559 from Ducz0r/lm-sci-1175-fix
Fix encoding when cloning tables [SCI-1175]
|
2017-04-25 14:38:34 +02:00 |
|
zmagod
|
ed24448817
|
adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203]
|
2017-04-25 14:24:05 +02:00 |
|
zmagod
|
1fefeee3d1
|
adds team space related methods
|
2017-04-25 13:44:31 +02:00 |
|
zmagod
|
66f43803c0
|
refactor, fix user annotation bug
|
2017-04-24 16:22:25 +02:00 |
|
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 |
|
Mojca Lorber
|
3aa1225e16
|
fix hound
|
2017-04-20 18:14:12 +02:00 |
|
Mojca Lorber
|
0bae4657f6
|
add experiment level to user smart annotation notification
|
2017-04-20 13:21:02 +02:00 |
|
Mojca Lorber
|
b1e939e715
|
add experiment to activities
|
2017-04-20 13:16:11 +02:00 |
|
Mojca Lorber
|
c13b8ab270
|
styling
|
2017-04-20 13:16:11 +02:00 |
|
Mojca Lorber
|
1606e2163c
|
add experiment level to notifications
|
2017-04-20 13:16:11 +02:00 |
|
Matej Zrimšek
|
314e8fcbd2
|
Added :inverse_of reference for all specific comment models. [fixes SCI-1207]
|
2017-04-19 23:38:23 +02:00 |
|
zmagod
|
0757563d02
|
adds step tiny_mce asset relation
|
2017-04-19 17:22:57 +02:00 |
|
Luka Murn
|
9479b65140
|
Hopefully fixes the encoding issues with audit trails
Closes SCI-1175.
|
2017-04-19 08:35:04 +02:00 |
|
Luka Murn
|
6a7e383316
|
Please the Hound
|
2017-04-18 15:38:11 +02:00 |
|
Zmago Devetak
|
e1a30cc17c
|
Merge pull request #558 from ZmagoD/zd_SCI_1192
fixes broken users search method for smart annotation [fixes SCI-1192]
|
2017-04-14 15:38:33 +02:00 |
|
Luka Murn
|
9c28608fbf
|
Fix encoding when cloning tables
Closes SCI-1175.
|
2017-04-13 17:00:27 +02:00 |
|
zmagod
|
9ee971c24b
|
fixes broken users search method for smart annotation [fixes SCI-1192]
|
2017-04-13 16:14:12 +02:00 |
|
Zmago Devetak
|
40af0df882
|
Merge pull request #551 from ZmagoD/zd_SCI_1189
fixes the user_name field in csv export [fixes SCI-1189]
|
2017-04-13 14:36:44 +02:00 |
|
zmagod
|
a6183af63d
|
fix method_missing again
|
2017-04-13 14:34:58 +02:00 |
|
zmagod
|
0534bce1ed
|
adds super in method_missing
|
2017-04-13 14:03:56 +02:00 |
|
zmagod
|
241af0620a
|
fixes hound alerts
|
2017-04-13 13:27:43 +02:00 |
|
zmagod
|
b6daf2648b
|
refactor zip_export
|
2017-04-13 13:01:05 +02:00 |
|
okriuchykhin
|
0fe84c4e24
|
Merge pull request #550 from okriuchykhin/ok_SCI_1157
Improve speed of search [SCI-1157]
|
2017-04-12 13:11:26 +02:00 |
|
zmagod
|
f4fdb840d8
|
fixes the user_name field in csv export [fixes SCI-1189]
|
2017-04-12 09:05:54 +02:00 |
|
Oleksii Kriuchykhin
|
07d658ab82
|
Improve speed of search [SCI-1157]
|
2017-04-11 14:55:44 +02:00 |
|
Matej Zrimšek
|
1447a34dc7
|
Files didn't get deleted in previous commit. [fixes SCI-1150]
|
2017-04-06 16:59:34 +02:00 |
|
Matej Zrimšek
|
e72184d10d
|
Fixed so that file deletion callbacks are triggered (and hence audit trails for this is generated). [fixes SCI-1150]
|
2017-04-06 11:34:03 +02:00 |
|
zmagod
|
e1ee53eeb5
|
generates query in background worker
|
2017-04-03 13:37:54 +02:00 |
|
Oleksii Kriuchykhin
|
42ccefe2ce
|
Remove logs table and old unused logging code [SCI-1127]
|
2017-03-30 11:47:57 +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 |
|
zmagod
|
239a44c26b
|
change send to public_send
|
2017-03-24 16:25:50 +01:00 |
|
zmagod
|
4635a3320d
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
|
2017-03-24 16:09:28 +01:00 |
|
zmagod
|
b352ef1600
|
removed unneeded method
|
2017-03-24 12:53:33 +01:00 |
|
zmagod
|
023b3213e8
|
fixes email link [fixes SCI-765]
|
2017-03-24 12:10:07 +01:00 |
|
zmagod
|
94732c6d18
|
adds delayed zip generator
|
2017-03-23 15:45:02 +01:00 |
|
Oleksii Kriuchykhin
|
2edebb282a
|
Add team_id field to assets and tables [SCI-1046]
|
2017-03-23 10:36:55 +01:00 |
|
zmagod
|
4385c68f5f
|
adds zip_export utility first run
|
2017-03-21 16:15:11 +01:00 |
|
zmagod
|
856a4611c6
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
|
2017-03-14 15:58:08 +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 |
|
okriuchykhin
|
2a33391f4b
|
Merge pull request #511 from okriuchykhin/ok_SCI_1090
Refactoring of the comments using STI [SCI-1090]
|
2017-03-10 10:50:43 +01:00 |
|
zmagod
|
1d42d46c02
|
fixes bug with step comments
|
2017-03-09 16:02:52 +01:00 |
|
zmagod
|
9939d8df06
|
refactor
|
2017-03-09 10:51:54 +01:00 |
|
zmagod
|
5c2e9a4b04
|
adds extends and fixes report methods
|
2017-03-08 14:14:03 +01:00 |
|
Oleksii Kriuchykhin
|
0f8336e5a5
|
Refactoring of the comments using STI [SCI-1090]
|
2017-03-08 13:18:20 +01:00 |
|
Luka Murn
|
043613782e
|
Minor change
|
2017-03-02 13:04:13 +01:00 |
|
zmagod
|
e1b3dcc2ba
|
adds enum extends to report element part of SCI-1003
|
2017-02-27 13:53:46 +01:00 |
|
Oleksii Kriuchykhin
|
35b0b33ddf
|
Add more extensive explanation when project name is already taken [SCI-759]
|
2017-02-22 14:18:48 +01:00 |
|
Oleksii Kriuchykhin
|
53ba9437b2
|
Fix circular dependency while loading Settings [SCI-1004]
|
2017-02-21 14:38:13 +01:00 |
|
okriuchykhin
|
95af5001ab
|
Merge pull request #484 from okriuchykhin/ok_SCI_1004
Add global settings base class [SCI-1004]
|
2017-02-21 13:20:24 +01:00 |
|
Oleksii Kriuchykhin
|
7703db3386
|
Change implementation of the Settings base class [SCI-1004]
|
2017-02-21 13:07:10 +01:00 |
|
okriuchykhin
|
8e18ff44a6
|
Merge pull request #479 from okriuchykhin/ok_SCI_999
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-20 15:19:00 +01:00 |
|
Oleksii Kriuchykhin
|
2aba0f46a6
|
Add global settings base class [SCI-1004]
|
2017-02-20 15:11:57 +01:00 |
|
Oleksii Kriuchykhin
|
218e96b1f0
|
Code style fixes [SCI-999]
|
2017-02-16 11:45:07 +01:00 |
|
Luka Murn
|
86be639a7c
|
Please the Hound
|
2017-02-13 14:20:44 +01:00 |
|
Luka Murn
|
3313d14316
|
Fix search for administrators and projects
Closes SCI-958.
|
2017-02-13 14:15:53 +01:00 |
|
Luka Murn
|
c6ed73bc82
|
Allow team admins to see all projects, even hidden ones
|
2017-02-13 13:42:53 +01:00 |
|
Oleksii Kriuchykhin
|
cf8566df33
|
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-10 14:27:20 +01:00 |
|
Zmago Devetak
|
5c9954bb89
|
Merge pull request #450 from ZmagoD/zd_SCI_939
Refactor "organizations" to "teams"
|
2017-02-01 13:12:02 +01:00 |
|
zmagod
|
be5faad97c
|
fixes hound
|
2017-01-31 13:33:55 +01:00 |
|
mlorb
|
bc8c4c3c6c
|
Merge pull request #463 from mlorb/ml_sci_965
Fix step does not save if table is without content [SCI-965]
|
2017-01-30 11:08:21 +01:00 |
|
Mojca Lorber
|
b291553d01
|
fix hound
|
2017-01-27 16:36:03 +01:00 |
|
Mojca Lorber
|
d5021fad2c
|
fix step does not save if table is without content
|
2017-01-27 16:25:11 +01:00 |
|
Oleksii Kriuchykhin
|
08aa882155
|
Fix generation of image previews after protocol loading from repo [SCI-951]
|
2017-01-26 13:19:59 +01:00 |
|
zmagod
|
1220466035
|
fixing hound
|
2017-01-25 15:00:14 +01:00 |
|
zmagod
|
f04a2f663a
|
renamed organizations in config/
|
2017-01-25 12:30:11 +01:00 |
|
zmagod
|
9d90b9b42a
|
rename Organization to Team in models
|
2017-01-24 17:08:48 +01:00 |
|
zmagod
|
a193850ae6
|
rename models where org/organization
|
2017-01-24 16:34:21 +01:00 |
|
Luka Murn
|
53699193a2
|
Merge branch 'smart-annotations'
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
|
2017-01-24 14:33:23 +01:00 |
|
zmagod
|
20cde2654b
|
fixed user without permissions bug [fixes SCI-922]
|
2017-01-23 10:53:42 +01:00 |
|
zmagod
|
9550c6dd35
|
fixes highlight.js
|
2017-01-19 17:09:25 +01:00 |
|
mz3944
|
b5e38afb64
|
Merge pull request #416 from mz3944/mz-sci-884
Smart annotation bug fixes [SCI-884, SCI-889] [WIP]
|
2017-01-18 16:13:19 +01:00 |
|
Mojca Lorber
|
6155a458e7
|
update search
|
2017-01-18 14:22:19 +01:00 |
|
Mojca Lorber
|
dde9854bf1
|
update protocol import/export and clone
|
2017-01-18 14:22:19 +01:00 |
|
Mojca Lorber
|
b3c423c582
|
add table name in protocol step
|
2017-01-18 14:22:18 +01:00 |
|
Oleksii Kriuchykhin
|
55d0e82fcd
|
Change If statement to ternary operator [SCI-887]
|
2017-01-18 13:43:21 +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 |
|
Matej Zrimšek
|
3085452ec9
|
Fixed some hound alerts. [SCI-884]
|
2017-01-17 11:04:16 +01:00 |
|
Oleksii Kriuchykhin
|
50edaef4ff
|
Do not show archived projects, experiments and tasks in smart annotations [SCI-887]
|
2017-01-16 16:55:10 +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 |
|
Matej Zrimšek
|
15d7944302
|
Preventing splitting of the words in the lookup query for # smart annotations. Query on the # is now performed on every character input, before it sometimes just filtered out the old (results count limited) query. Some refactoring of samrt annotations JS. [SCI-884, SCI-889]
|
2017-01-13 18:51:05 +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 |
|
Oleksii Kriuchykhin
|
0350f2f792
|
Add html escaping to name filelds in the views [SCI-102]
|
2017-01-12 11:03:14 +01:00 |
|
zmagod
|
1840fdb7e5
|
cleanup js
|
2017-01-12 09:52:29 +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
|
fc76a4ae6d
|
Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834
|
2017-01-10 14:22:04 +01:00 |
|
zmagod
|
89e8946a47
|
expand smart annotation
|
2017-01-10 14:14:21 +01:00 |
|
zmagod
|
6efcf49927
|
working version of dropdown filter
|
2017-01-10 14:14:21 +01:00 |
|
zmagod
|
53d20df449
|
added xregexp
|
2017-01-10 14:14:21 +01:00 |
|
zmagod
|
94262b56ef
|
prepare data for atwho
|
2017-01-10 14:14:21 +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 |
|
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 |
|
Luka Murn
|
488613afcc
|
Add index to users' full name attribute
|
2017-01-05 16:26:49 +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
|
0ecb6904d4
|
Add user input sanitizing in the models [SCI-102]
|
2017-01-05 13:31:35 +01:00 |
|
Luka Murn
|
a78bb79618
|
Temp commit
|
2017-01-05 12:07:17 +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 |
|
Oleksii Kriuchykhin
|
4d3e002c81
|
Add sorting to Project's experiments overview [SCI-361]
|
2016-12-23 15:40:01 +01:00 |
|
zmagod
|
e554fdf805
|
code refactor
|
2016-12-21 16:52:15 +01:00 |
|
Oleksii Kriuchykhin
|
b537feb8a0
|
Added large preview [SCI-694]
|
2016-12-16 17:07:08 +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
|
b87246c8c2
|
cleanup spinner after edit step
|
2016-12-16 11:10:03 +01:00 |
|
Mojca Lorber
|
69d164da68
|
add new column on first position
|
2016-12-15 11:20:40 +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 |
|
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 |
|
Luka Murn
|
d30a9780f4
|
Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
|
2016-12-12 09:57:37 +01:00 |
|
Oleksii Kriuchykhin
|
274fd63a41
|
Initial code commit [SCI-779]
|
2016-12-09 15:21:26 +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 |
|
Mojca Lorber
|
0e3526c9ad
|
Merge branch 'mlorb-ml-sci-696' into improved-sample-table
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
|
2016-12-08 15:44:50 +01:00 |
|
zmagod
|
40fdfef67f
|
setup delayed_paperclip gem
|
2016-12-08 15:24:14 +01:00 |
|
Mojca Lorber
|
7d88e247fc
|
refactoring
|
2016-12-08 14:41:35 +01:00 |
|
zmagod
|
ac52e643be
|
cleanup direct upload
|
2016-12-08 11:26:13 +01:00 |
|
Nbernot
|
1eb3ddee53
|
Token expiration restored to 1 day.
|
2016-12-08 11:12:24 +01:00 |
|
Mojca Lorber
|
227fe9c284
|
change to after_create
|
2016-12-07 17:43:00 +01:00 |
|
Mojca Lorber
|
87dc76f4e3
|
change to update samples table state after initialize
|
2016-12-07 17:25:42 +01:00 |
|
Mojca Lorber
|
114a17ff0f
|
change to create
|
2016-12-07 16:57:17 +01:00 |
|
Mojca Lorber
|
228990f9da
|
fix samples table state, when adding new custom column
|
2016-12-07 16:37:16 +01:00 |
|
Mojca Lorber
|
195055f9cf
|
change SAMPLES_TABLE_DEFAULT_STATE
|
2016-12-07 14:51:34 +01:00 |
|
Mojca Lorber
|
39b6fa66fe
|
add SamplesTable for new users
|
2016-12-07 14:14:32 +01:00 |
|
Luka Murn
|
62353b6c3b
|
Temporary change token expiration
|
2016-12-06 16:33:32 +01:00 |
|
Mojca Lorber
|
01e75fbbcc
|
create samples table model and migration
|
2016-12-05 11:08:33 +01:00 |
|
zmagod
|
7725374c42
|
refactor sample types/groups [fixes SCI-700]
|
2016-12-02 09:58:35 +01:00 |
|
Luka Murn
|
372b455d7d
|
Merge pull request #332 from Ducz0r/lm-sci-750-751
Fix inviting users not working
|
2016-12-01 15:52:40 +01:00 |
|
Luka Murn
|
6a770f6a7e
|
Fix inviting users not working
Closes SCI-750, SCI-751.
Probably reopens parts of SCI-746.
|
2016-12-01 15:46:37 +01:00 |
|
Nejc Bernot
|
c54bd6df82
|
Added user ids to wopi tokens
|
2016-12-01 13:48:11 +01:00 |
|
Matej Zrimšek
|
46465060d0
|
Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689]
|
2016-11-30 16:56:56 +01:00 |
|