Luka Murn
|
62d97f6e64
|
Merge pull request #655 from Ducz0r/lm-sci-1321
Fix bug with TinyMCE not working for steps with nil description [SCI-1321]
|
2017-06-06 07:59:24 +02:00 |
|
Luka Murn
|
f298ec54e7
|
Code beautification per @zmagod's request
Closes SCI-1321.
|
2017-06-06 07:58:46 +02:00 |
|
Matej Zrimšek
|
afce3010ef
|
After repository deletion, the next selected repository is the first one. [SCI-1269]
|
2017-06-05 17:56:09 +02:00 |
|
Luka Murn
|
8c7aebbb88
|
Fix bug with TinyMCE not working for steps with nil description
Closes SCI-1321.
|
2017-06-05 17:43:03 +02:00 |
|
Matej Zrimšek
|
419d638163
|
Renamed reposiotry edit and destroy permission helper. [fix 1269]
|
2017-06-05 17:36:26 +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 |
|
mlorb
|
3dc83cfe05
|
Merge pull request #650 from mlorb/ml_sci_1286
Fix bug with titles truncate in activities [SCI-1286]
|
2017-06-05 16:27:44 +02:00 |
|
Mojca Lorber
|
27d3a5097b
|
fix hound
|
2017-06-05 16:07:21 +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
|
5aba15e220
|
Made repository names case insensitive. [fix 1269]
|
2017-06-05 10:38:04 +02:00 |
|
Matej Zrimšek
|
f012779780
|
Renamed before_action for repository edit and destroy action. [fix 1269]
|
2017-06-05 10:02:16 +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
|
73aaef0949
|
Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269]
|
2017-06-02 17:52:04 +02:00 |
|
Matej Zrimšek
|
c82fd66146
|
Removed unneeded utility JS function. [SCI-1269]
|
2017-06-02 17:52:04 +02:00 |
|
Matej Zrimšek
|
5c9a453439
|
Added permissions for deleting and renaming of repositories. [SCI-1269]
|
2017-06-02 17:50:34 +02:00 |
|
Matej Zrimšek
|
9a7048cc7a
|
Code formatting updated for repositories. [SCI-1269]
|
2017-06-02 17:50:34 +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 |
|
Matej Zrimšek
|
b92a760a5c
|
Added dropdown GUI for editing repository. [SCI-1269]
|
2017-06-02 17:47:28 +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 |
|
Mojca Lorber
|
7c2b657b0e
|
fix bug with special characters when truncating activities titles
|
2017-06-01 15:10:26 +02:00 |
|
Mojca Lorber
|
d88b21fb5e
|
truncate all titles in activities
|
2017-06-01 15:09:01 +02:00 |
|
okriuchykhin
|
c88fc84538
|
Merge pull request #633 from okriuchykhin/ok_SCI_960_v2
Add smart annotations in sample info modal [SCI-960]
|
2017-05-31 11:31:14 +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
|
6e1f93dd11
|
minor fix
|
2017-05-29 14:47:05 +02:00 |
|
zmagod
|
b527afd12b
|
generates samples csv file in background job [fixes SCI-1278]
|
2017-05-29 14:42:55 +02:00 |
|
mz3944
|
689587c4fc
|
Merge pull request #643 from mz3944/mz-SCI-1305
Handled user removal from the team for user smart annotation [fixes SCI-1305]
|
2017-05-29 12:52:19 +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 |
|
mz3944
|
d83dcac894
|
Merge pull request #642 from mz3944/mz-SCI-1291
Fixed permission error while cloning workflows. [fixes SCI-1291]
|
2017-05-29 09:53:33 +02:00 |
|
zmagod
|
5806cb8e67
|
removes unneeded animateSpinner call
|
2017-05-29 09:10:11 +02:00 |
|
Matej Zrimšek
|
19ffd77d32
|
Requests failed if smart annotation referenced a user who was no longer in the team. [fixes SCI-1305]
|
2017-05-26 18:14:15 +02:00 |
|
Matej Zrimšek
|
853096634d
|
Fixed permission error while cloning workflows. [fixes SCI-1291]
|
2017-05-26 11:14:50 +02:00 |
|
Oleksii Kriuchykhin
|
157b1630b9
|
Add missing include for sinitize_input [SCI-1309]
|
2017-05-25 16:28:06 +02:00 |
|
Mojca Lorber
|
c3051421b2
|
change truncate function
|
2017-05-25 11:01:24 +02:00 |
|
Mojca Lorber
|
8540f88b7e
|
small fix - renaming of ids and hrefs
|
2017-05-25 10:06:48 +02:00 |
|
Oleksii Kriuchykhin
|
7310763184
|
Add missing include [SCI-1306]
|
2017-05-25 08:57:50 +02:00 |
|
mlorb
|
58ac457d38
|
fix merge bug
|
2017-05-23 11:32:02 +02:00 |
|
mlorb
|
872f712be8
|
Merge branch 'custom-repositories' into ml_sci_1266_v2
|
2017-05-23 11:05:25 +02:00 |
|
mz3944
|
6b8c8deb16
|
Merge pull request #634 from mz3944/mz-SCI-414
Uncompleted steps not added to Reports
|
2017-05-23 09:58:05 +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
|
b223646f07
|
Small improvements [SCI-1273]
|
2017-05-23 08:53:53 +02:00 |
|
Mojca Lorber
|
a716a0b1db
|
change breadcrumbs on protocol managements page
|
2017-05-22 17:58:42 +02:00 |
|
Mojca Lorber
|
9ae615264d
|
add global repositories screen - tab control
|
2017-05-22 17:54:30 +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 |
|
Matej Zrimšek
|
f78c80b148
|
Added possibility to add uncompleted steps to report. [closes SCI-414]
|
2017-05-17 13:25:21 +02:00 |
|
Oleksii Kriuchykhin
|
7f713b4293
|
Add smart annotations in sample info modal [SCI-960]
|
2017-05-17 13:06:21 +02:00 |
|
Oleksii Kriuchykhin
|
85e81e9ea2
|
Improve repository models and migration [SCI-1267]
|
2017-05-17 10:04:07 +02:00 |
|
Oleksii Kriuchykhin
|
f28df506f9
|
Fix bug in counting search results for assets [SCI-1284]
|
2017-05-17 09:08:40 +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 |
|
zmagod
|
b21923cf98
|
prevent to duplicate new step [fixes SCI-1280]
|
2017-05-16 11:52:07 +02:00 |
|
gazvoda
|
f6bd39ec70
|
Merge pull request #604 from gazvoda/lg-SCI-1145
Added migration to remove updated_at from Activity [fixes SCI-1145]
|
2017-05-16 08:49:10 +01:00 |
|
Matej Zrimšek
|
2c6f888cbc
|
Replace present? with more efficient exitst? for report content adding modal. [fixes SCI-487]
|
2017-05-15 18:56:41 +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
|
dbb79ebab1
|
Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]
|
2017-05-15 17:43:12 +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 |
|
Zmago Devetak
|
18e11fde59
|
Merge pull request #616 from ZmagoD/zd_SCI_1248
Prevent double input fields (results)
|
2017-05-15 16:27:03 +02:00 |
|
Zmago Devetak
|
39203a16f4
|
Merge pull request #622 from ZmagoD/zd_SCI_1261
fixes remove user action on project [fixes SCI-1261]
|
2017-05-15 15:28:39 +02:00 |
|
Zmago Devetak
|
a151bbdd7d
|
Merge pull request #623 from ZmagoD/zd_SCI_974
adds persistence to experiments order in project overview [fixes SCI-…
|
2017-05-15 15:28:18 +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 |
|
okriuchykhin
|
16325db1c6
|
Merge pull request #621 from okriuchykhin/ok_SCI_1263
Fix sorting in reports [SCI-1263]
|
2017-05-15 09:57:35 +02:00 |
|
zmagod
|
c35e2a4860
|
adds persistence to experiments order in project overview [fixes SCI-974]
|
2017-05-15 09:54:37 +02:00 |
|
okriuchykhin
|
9f9691de59
|
Merge pull request #620 from okriuchykhin/ok_SCI_452
Disable turbolinks on search links to fix JS errors [SCI-452]
|
2017-05-12 17:02:29 +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 |
|
zmagod
|
b6367981c7
|
fixes remove user action on project [fixes SCI-1261]
|
2017-05-12 16:18:53 +02:00 |
|
Oleksii Kriuchykhin
|
5a2d618b1d
|
Fix sorting in reports [SCI-1263]
|
2017-05-12 16:04:19 +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 |
|
Oleksii Kriuchykhin
|
ad39d09a53
|
Disable turbolinks on search links to fix JS errors [SCI-452]
|
2017-05-12 13:23:29 +02:00 |
|
Oleksii Kriuchykhin
|
79efb34191
|
Fixes error when clonning experiments with long names [SCI-617]
|
2017-05-12 11:07:11 +02:00 |
|
Zmago Devetak
|
0dc4addd6c
|
fix typo
|
2017-05-12 10:10:50 +02:00 |
|
zmagod
|
070a829c49
|
change new results hendlers
|
2017-05-12 10:02:33 +02:00 |
|
Oleksii Kriuchykhin
|
bb8c7c342c
|
Add additional info to samples info modal [SCI-960]
|
2017-05-11 22:20:06 +02:00 |
|
zmagod
|
81a3cb0a41
|
adds results js code in modules
|
2017-05-11 16:54:28 +02:00 |
|
Oleksii Kriuchykhin
|
5d55720aad
|
Fix steps ordering in reports [SCI-1008]
|
2017-05-11 15:56:33 +02:00 |
|
Oleksii Kriuchykhin
|
0ef9c7eff6
|
Fix task ordering in reports [SCI-1008]
|
2017-05-11 15:30:19 +02:00 |
|
okriuchykhin
|
ab0d882be1
|
Merge pull request #614 from okriuchykhin/ok_SCI_1254
Fix step actions in reports [SCI-1254]
|
2017-05-11 14:44:36 +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 |
|
Oleksii Kriuchykhin
|
fe134419a3
|
Fix step actions in reports [SCI-1254]
|
2017-05-11 13:51:43 +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 |
|
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 |
|
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 |
|
okriuchykhin
|
f239238064
|
Merge pull request #611 from okriuchykhin/ok_SCI_1252
Fix root_url method unavailable in application_helper [SCI-1252]
|
2017-05-11 11:15:00 +02:00 |
|
okriuchykhin
|
15f19b73fb
|
Merge pull request #610 from okriuchykhin/ok_SCI_1253
Add notifications counter badge to project card [SCI-1253]
|
2017-05-11 11:11:09 +02:00 |
|
okriuchykhin
|
000ca26452
|
Merge pull request #607 from okriuchykhin/ok_SCI_1243
Add specific classes to task card for analytics [SCI-1243]
|
2017-05-11 11:10:05 +02:00 |
|
osboxes.org
|
8c83b3a196
|
Added updated_at values and unnecessary migration rollback [fixes SCI-1145]
|
2017-05-11 11:08:36 +02:00 |
|
Oleksii Kriuchykhin
|
229693ec61
|
Fix root_url method unavailable in application_helper [SCI-1252]
|
2017-05-10 18:15:08 +02:00 |
|
Oleksii Kriuchykhin
|
a5926726ce
|
Add notifications counter badge to project card [SCI-1253]
|
2017-05-10 17:28:37 +02:00 |
|
Zmago Devetak
|
cb79a405c3
|
Merge pull request #609 from ZmagoD/zd_SCI_1248_v2
fixes input sanitize method [fixes SCI-1248]
|
2017-05-10 15:36:57 +02:00 |
|
zmagod
|
511f39e093
|
add constants
|
2017-05-10 15:33:33 +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
|
10db322307
|
fixes input sanitize method [fixes SCI-1248]
|
2017-05-10 14:57:11 +02:00 |
|
zmagod
|
a4032f5cc6
|
first run
|
2017-05-10 13:53:32 +02:00 |
|
Oleksii Kriuchykhin
|
08e7f09d07
|
Add specific classes to task card for analytics [SCI-1243]
|
2017-05-10 10:33:34 +02:00 |
|
okriuchykhin
|
f46c0dfaef
|
Merge pull request #603 from okriuchykhin/ok_SCI_152_v2
Improve view of badges on experiment canvas [SCI-152]
|
2017-05-10 09:46:02 +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 |
|
Zmago Devetak
|
13570ba5cb
|
Merge pull request #602 from ZmagoD/zd_SCI_1247
fixes pdf export and image size [fixes SCI-1247]
|
2017-05-10 09:31:55 +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 |
|
Zmago Devetak
|
cd503580b2
|
Merge pull request #599 from ZmagoD/zd_SCI_1241
fix samples bug [SCI-1241]
|
2017-05-09 15:55:43 +02:00 |
|
mlorb
|
078eb7789f
|
Merge pull request #605 from mlorb/ml_sci_fix_bug_with_avatar_in_system_log
Fix bug with avatar in system log
|
2017-05-09 14:57:07 +02:00 |
|
Mojca Lorber
|
7ca62a16bb
|
fix hound
|
2017-05-09 14:55:23 +02:00 |
|
Mojca Lorber
|
e1475fbfef
|
fix bug with avatar in system log
|
2017-05-09 14:40:02 +02:00 |
|
Oleksii Kriuchykhin
|
620a989a2f
|
Improve view of badges on experiment canvas [SCI-152]
|
2017-05-09 14:07:23 +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 |
|
zmagod
|
df13478186
|
fix samples bug [SCI-1241]
|
2017-05-09 11:25:00 +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
|
7a61f5813c
|
Add comments to the code [SCI-152]
|
2017-05-09 10:22:01 +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 |
|
zmagod
|
d6f303581f
|
refactor
|
2017-05-08 12:56:33 +02:00 |
|
Oleksii Kriuchykhin
|
3f60439948
|
Change color of loading animation in reports [SCI-1029]
|
2017-05-08 11:02:51 +02:00 |
|
ajugo
|
2973ead765
|
Missing files, comments, checklist in steps [fixes SCI-1224] (#591)
* Missing files, comments, checklist in steps [fixes SCI-1224]
* Code fixes
|
2017-05-08 10:44:15 +02:00 |
|
Zmago Devetak
|
e47bf8f013
|
Merge pull request #582 from ZmagoD/zd_SCI_1051
fix reports pdf for user annotation [SCI-1051]
|
2017-05-08 10:24:40 +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 |
|
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 |
|
Zmago Devetak
|
28042d11e1
|
Merge pull request #589 from ZmagoD/zd_SCI_488
adds label to step in report [fixes SCI-488]
|
2017-05-05 14:56:01 +02:00 |
|
zmagod
|
f079a097c5
|
removes TempFile after 7 days [fixes SCI-160]
|
2017-05-05 14:54:22 +02:00 |
|
Zmago Devetak
|
f3415abe3e
|
Merge pull request #587 from ZmagoD/zd_SCI_1233
fixes bug with empty checklist item [fixes SCI-1233]
|
2017-05-05 10:11:52 +02:00 |
|
zmagod
|
b22350136f
|
adds label to step in report [fixes SCI-488]
|
2017-05-05 09:45:18 +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
|
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 |
|
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
|
289a148332
|
refactor
|
2017-05-03 15:33:23 +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 |
|
Zmago Devetak
|
cc6c2942c2
|
Merge pull request #574 from ZmagoD/zd_SCI_1194_v2
prevent to get nil as a param in checklist_item_annotation method [fi…
|
2017-05-03 10:56:21 +02:00 |
|
zmagod
|
d5abb52909
|
refactor
|
2017-05-03 10:55:11 +02:00 |
|
zmagod
|
1b618e88e5
|
fix reports pdf for user annotation [SCI-1051]
|
2017-05-03 10:50:43 +02:00 |
|
mz3944
|
ca72133e2b
|
Merge pull request #579 from gazvoda/lg-SCI-1214
Tab Teams is highlighted when in Audit trails [fixes SCI-1214]
|
2017-04-28 12:08:32 +02:00 |
|
osboxes.org
|
21a39fc704
|
Code indentation corrected [fixes SCI-1214]
|
2017-04-28 10:31:14 +01:00 |
|
osboxes.org
|
f72802f9f2
|
Tab Teams is highlighted when in Audit trails [fixes SCI-1214]
|
2017-04-26 16:31:44 +01:00 |
|
okriuchykhin
|
dbd9da916b
|
Merge pull request #577 from okriuchykhin/ok_SCI_1029
Change color of turbolinks progress bar [SCI-1029]
|
2017-04-26 15:05:44 +02:00 |
|
Oleksii Kriuchykhin
|
d3fb688fce
|
Change color of turbolinks progress bar [SCI-1029]
|
2017-04-26 15:04:29 +02:00 |
|
okriuchykhin
|
3735bbb0f8
|
Merge pull request #578 from okriuchykhin/ok_SCI_1128
Fix dowload of export zip files from local storage [SCI-1128]
|
2017-04-26 13:44:30 +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 |
|
Zmago Devetak
|
9704b3ffd4
|
Merge pull request #572 from ZmagoD/zd_SCI_1192_ver2
make search for users case insensitive [fixes SCI-1192]
|
2017-04-26 13:34:16 +02:00 |
|
zmagod
|
0e383109a1
|
refactor query
|
2017-04-26 13:32:03 +02:00 |
|
Oleksii Kriuchykhin
|
cf7d0ea248
|
Fix dowloand of export zip files from local storage [SCI-1128]
|
2017-04-26 13:23:30 +02:00 |
|
Oleksii Kriuchykhin
|
9055894d07
|
Add additional sanitization to search parameters in datatables [SCI-763]
|
2017-04-25 17:37:42 +02:00 |
|
zmagod
|
0456393317
|
prevent to get nil as a param in checklist_item_annotation method [fixes SCI-1194]
|
2017-04-25 16:22:10 +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 |
|
zmagod
|
615bbb9967
|
make search for users case insensitive [fixes SCI-1192]
|
2017-04-25 15:33:51 +02:00 |
|
mlorb
|
b930af0033
|
Merge pull request #571 from mlorb/ml_sci_316
Remove behavior of not allowing the empty tables in steps [SCI-316]
|
2017-04-25 15:30:30 +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 |
|
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
|
86c6ae3b03
|
display tinyMCE images in reports
|
2017-04-25 09:53:35 +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 |
|
mlorb
|
54f1c7b3e8
|
Merge pull request #566 from mlorb/ml_sci_365
New experiment redirection [SCI-365]
|
2017-04-24 08:55:55 +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
|
cf00ecd62e
|
new experiment redirection
|
2017-04-20 17:55:28 +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 |
|
mz3944
|
a0b5a94d67
|
Merge pull request #564 from mz3944/mz-SCI-856
Case insensitive email invitation
|
2017-04-19 09:36:46 +02:00 |
|
zmagod
|
37be04c09c
|
add tiny_mce controller
|
2017-04-19 09:13:16 +02:00 |
|
zmagod
|
c25df63a14
|
add tinymce img importer and refactor input sanitize helper
|
2017-04-19 09:11:52 +02:00 |
|
Luka Murn
|
9479b65140
|
Hopefully fixes the encoding issues with audit trails
Closes SCI-1175.
|
2017-04-19 08:35:04 +02:00 |
|
Matej Zrimšek
|
bafdbf4082
|
Email is now case insensitive when inviting users by it. [fixes SCI-856]
|
2017-04-18 18:01:29 +02:00 |
|
Matej Zrimšek
|
57b6b9402d
|
Experiment description is inside of box for every supported browser. [fixes SCI-860]
|
2017-04-18 16:44:01 +02:00 |
|
Luka Murn
|
6a7e383316
|
Please the Hound
|
2017-04-18 15:38:11 +02:00 |
|
mz3944
|
0ebf294844
|
Merge pull request #562 from mz3944/mz-SCI-1187
Added general locale for cases when a name is optional and is not spe…
|
2017-04-18 15:26:35 +02:00 |
|
Matej Zrimšek
|
a889174938
|
Name of result tables should be nil, as it can't be specified. [fixes SCI-1187]
|
2017-04-18 15:08:13 +02:00 |
|
okriuchykhin
|
3d805d529d
|
Merge pull request #554 from okriuchykhin/ok_SCI_877
Add image preview to protocol repository [SCI-877]
|
2017-04-18 08:58:39 +02:00 |
|
Oleksii Kriuchykhin
|
4fac6484b5
|
Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877]
|
2017-04-14 16:05:35 +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 |
|
zmagod
|
8af3858209
|
fix hound
|
2017-04-14 11:13:58 +02:00 |
|