okriuchykhin
56c3b891a5
Merge pull request #673 from okriuchykhin/ok_SCI_1350
...
Fix row selection info after record deletion [SCI-1350]
2017-06-13 09:00:48 +02:00
okriuchykhin
05c77e7298
Merge pull request #672 from okriuchykhin/ok_SCI_1341
...
Fix row selecton after column reorder in repositories [SCI-1341]
2017-06-13 09:00:33 +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
Oleksii Kriuchykhin
248fd7be06
Fix reordering columns to the first position [SCI-1346]
2017-06-12 17:16:49 +02:00
Oleksii Kriuchykhin
c081cda5f3
Fix row selection info after record deletion [SCI-1350]
2017-06-12 10:23:18 +02:00
Oleksii Kriuchykhin
aa42ca6b8b
Fix row selecton after column reorder in repositories [SCI-1341]
2017-06-12 10:07:16 +02:00
Matej Zrimšek
514aa6214b
Repository records minor JS refactoring. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
29b721365a
Moved export form to proper place in the code. [SCI-1275]
2017-06-09 19:44:28 +02:00
rekonder
4df8e1ffe3
Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository
2017-06-09 19:44:28 +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
d1977d0773
fixes long column names in repository dropdown [fixes SCI-1338]
2017-06-09 11:42:38 +02:00
Zmago Devetak
4873624cec
Merge pull request #658 from ZmagoD/zd_SCI_1011
...
Multiple file upload with drag & drop capability in steps and results
2017-06-09 10:03:33 +02:00
zmagod
33b996ffee
refactor
2017-06-09 09:49:57 +02:00
Luka Murn
7bb1af3692
Minor JS fix
2017-06-08 15:28:26 +02:00
Mojca Lorber
0004c2b7d5
fix selection of tab after redirection
2017-06-08 14:17:27 +02:00
Mojca Lorber
71c523c406
load tabs with javascript
2017-06-08 13:47:30 +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
27feb46d8f
Merge pull request #659 from Ducz0r/lm-sci-1279
...
Include repositories in reports [SCI-1279]
2017-06-08 11:24:21 +02:00
Luka Murn
38361e4bb4
Setup initial GUI
2017-06-07 18:43:48 +02:00
Luka Murn
0aee11d6d8
Hound is love, Hound is life #2
2017-06-07 18:26:32 +02:00
Matej Zrimšek
77a225ec31
Added toggle between assigned and all repository records. [SCI-1276]
2017-06-07 18:13:25 +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
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
Zmago Devetak
fcec42ae31
Merge pull request #645 from ZmagoD/zd_SCI_1278
...
generates samples csv file in background job [fixes SCI-1278]
2017-06-07 15:04:24 +02:00
zmagod
c6bb20039b
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
2017-06-07 13:29:39 +02:00
Mojca Lorber
51c4eeb106
renaming
2017-06-06 15:50:43 +02:00
Mojca Lorber
39dda1ad5d
refactoring
2017-06-06 13:18:44 +02:00
ajugo
887d9a4f52
Samples - show all/show assigned [SCI-1277] ( #644 )
...
* Samples - show all/show assigned [SCI-1277]
* Some fixes in code
* Some minor fixes in code
* Omit present
* Correct missed present
* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Mojca Lorber
da98788031
small code fixes
2017-06-06 09:57:50 +02:00
Mojca Lorber
13bf4ad229
create new repository
2017-06-06 09:54:39 +02:00
Luka Murn
f382c04f01
Refactor JS code a bit
...
Closes SCI-1323.
2017-06-06 08:02:01 +02:00
Luka Murn
1712fc0611
Fix bug with protocol preview modal not working in protocol repo
...
Closes SCI-1323.
2017-06-05 17:10:13 +02:00
Matej Zrimšek
2c6ad4aa05
Refactored modal popups for repositories to make them general. [fix 1269]
2017-06-05 14:13:24 +02:00
zmagod
ab4961ddb1
adds overlay partial
2017-06-05 11:31:05 +02:00
zmagod
67d902db52
refactor
2017-06-05 10:43:58 +02:00
Matej Zrimšek
d8d54232c3
After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]
2017-06-02 19:08:51 +02:00
Matej Zrimšek
c82fd66146
Removed unneeded utility JS function. [SCI-1269]
2017-06-02 17:52:04 +02:00
Matej Zrimšek
f8258812ef
Repository remove and rename refactoring. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
21a72da84f
Added rename logic and improved remove logic. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
cdaac6a01b
Added remove repository modal logic. [SCI-1269]
2017-06-02 17:50:33 +02:00
Matej Zrimšek
791bb934ca
Remove repository modal logic (WIP). [SCI-1269]
2017-06-02 17:50:33 +02:00
zmagod
1c021b11db
adds drag and drop files upload to steps [fixes SCI-1310]
2017-06-02 16:34:09 +02:00
ajugo
a9bd86352d
Step: wrong last columns of table [fixes SCI-405] ( #600 )
...
* Step: wrong last two columns of table after add table results [fixes SCI-405]
* Changing double quotes to single
* Adding empty line back
2017-06-01 15:52:02 +02:00
Luka Murn
fcc3995049
Merge pull request #647 from biosistemika/master
...
Bring latest master changes into custom-repositories
2017-05-30 14:18:14 +02:00
zmagod
b527afd12b
generates samples csv file in background job [fixes SCI-1278]
2017-05-29 14:42:55 +02:00
Zmago Devetak
1df6265326
Merge pull request #627 from ZmagoD/zd_SCI_1280
...
prevent to duplicate new step [fixes SCI-1280]
2017-05-29 09:55:22 +02:00
zmagod
5806cb8e67
removes unneeded animateSpinner call
2017-05-29 09:10:11 +02:00
mz3944
9fe3b717c8
Merge pull request #626 from mz3944/mz-SCI-487
...
Simplify "Add contents to report" popup
2017-05-23 09:57:39 +02:00
Oleksii Kriuchykhin
e99e3edb7b
Add repositories dropdown to task navigation [SCI-1273]
2017-05-18 14:21:00 +02:00
ajugo
1abaefce4f
At importing large sample file, error flash message appears [fixes SCI-903] ( #625 )
...
* At importing large sample file, error flash message appears [fixes SCI-903]
* Changing double quotes to single
* Adding animatedSpinner
2017-05-18 09:19:44 +02:00
Matej Zrimšek
20265ddd69
Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]
2017-05-17 18:18:57 +02:00
Oleksii Kriuchykhin
bbf6d38c50
Fix error handling in result_assets [SCI-1288]
2017-05-17 15:14:35 +02:00
zmagod
b21923cf98
prevent to duplicate new step [fixes SCI-1280]
2017-05-16 11:52:07 +02:00
Matej Zrimšek
79ec3b5e4c
Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487]
2017-05-15 18:20:42 +02:00
Matej Zrimšek
901558c733
Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487]
2017-05-15 18:20:42 +02:00
Matej Zrimšek
ba693c65a8
Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]
2017-05-15 18:20:42 +02:00
Matej Zrimšek
b97cb91840
Refactoring of modal for adding content to report. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
Matej Zrimšek
27cfd55ea5
Simplified popup modal for adding contents to report. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
zmagod
9bec7dd96e
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248
2017-05-15 14:49:37 +02:00
zmagod
d34b2520b5
refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]
2017-05-12 15:59:58 +02:00
zmagod
070a829c49
change new results hendlers
2017-05-12 10:02:33 +02:00
zmagod
81a3cb0a41
adds results js code in modules
2017-05-11 16:54:28 +02:00
mlorb
219921ee33
Merge pull request #612 from mlorb/ml_sci_1250
...
Fix sample page bugs when editing column name [SCI-1250]
2017-05-11 13:48:20 +02:00
okriuchykhin
328c9292b1
Merge pull request #606 from okriuchykhin/ok_SCI_1235
...
Fix error messages display during file upload in steps and results [SCI-1235]
2017-05-11 13:00:36 +02:00
Mojca Lorber
86bc6adc2a
fix lost column updated name at sample page and bug with another user not able to view column dropdown
2017-05-11 11:16:12 +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
zmagod
a4032f5cc6
first run
2017-05-10 13:53:32 +02:00
Oleksii Kriuchykhin
52ad5ecdc2
Fix error messages display during file upload in steps and results [SCI-1235]
2017-05-09 17:13:47 +02:00
Oleksii Kriuchykhin
620a989a2f
Improve view of badges on experiment canvas [SCI-152]
2017-05-09 14:07:23 +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
okriuchykhin
bd0b930382
Merge pull request #598 from okriuchykhin/ok_SCI_152
...
Add counters for users and comments on canvas [SCI-152]
2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin
bd5a48b9c8
Improve code style [SCI-1158]
2017-05-08 18:00:14 +02:00
Oleksii Kriuchykhin
344b9c290a
Add counters for users and comments on canvas [SCI-152]
2017-05-08 17:32:55 +02:00
okriuchykhin
f292dab3b5
Merge pull request #594 from okriuchykhin/ok_SCI_1029_v2
...
Change color of loading animation in reports [SCI-1029]
2017-05-08 13:35:00 +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
3f60439948
Change color of loading animation in reports [SCI-1029]
2017-05-08 11:02:51 +02:00
Oleksii Kriuchykhin
0ee7e11620
Add advanced search options [SCI-1158]
2017-05-05 16:41:23 +02:00
mlorb
4c85ac7bf5
Merge pull request #588 from mlorb/ml_sci_191
...
Add information how many samples are selected [SCI-191]
2017-05-05 15:24:16 +02:00
Zmago Devetak
de3d1172c1
Merge pull request #584 from ZmagoD/zd_SCI_1200
...
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-05 14:57:27 +02:00
Mojca Lorber
45baba1803
fix zmago the hound
2017-05-04 16:46:52 +02:00
Mojca Lorber
ad9497a638
add information how many samples are selected
2017-05-04 16:30:29 +02:00
zmagod
f784844472
fixes bug with empty checklist item [fixes SCI-1233]
2017-05-04 16:15:00 +02:00
zmagod
acc5594f1b
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-04 12:41:22 +02:00
Mojca Lorber
f8f6a5f63a
fix bug edit canvas not working and fix positioning of cloned task/workflow
2017-05-04 10:54:50 +02:00
zmagod
5b58824ec0
refactor
2017-05-03 15:30:08 +02:00
ajugo
41df727e57
Merge pull request #569 from rekonder/aj-SCI-1130
...
Fix error with close on reports
2017-05-03 12:27:42 +02:00
ajugo
081aa4aea7
Merge pull request #570 from rekonder/aj-SCI-1088
...
My profile - avatar size fix [SCI-1088]
2017-05-03 12:27:05 +02:00
Oleksii Kriuchykhin
d3fb688fce
Change color of turbolinks progress bar [SCI-1029]
2017-04-26 15:04:29 +02:00
Matej Zrimšek
8ad52354eb
Used locales instead of hardcoded values for intro.js tutorial popup.
2017-04-25 16:03:50 +02:00
Matej Zrimšek
e8bc9542cc
Removed some unneeded intro.js tutorial code.
2017-04-25 16:03:50 +02:00
Matej Zrimšek
a6573bd508
Next button is now always focused when navigating through tutorial steps. [fixes SCI-719]
2017-04-25 16:03:50 +02:00
Matej Zrimšek
a5cffd06f3
Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]
2017-04-25 16:03:50 +02:00
Mojca Lorber
49574e7a06
remove behavior of not allowing the empty tables in steps
2017-04-25 10:21:16 +02:00
rekonder
b93edac3b9
My profile - avatar size fixes [SCI-1088]
2017-04-25 10:02:00 +02:00
zmagod
66f43803c0
refactor, fix user annotation bug
2017-04-24 16:22:25 +02:00
rekonder
dc46a7b650
Fix error with close on reports
2017-04-24 16:02:30 +02:00
zmagod
55c8c498e2
add image upload functionality to result text
2017-04-24 12:28:27 +02:00
