Mojca Lorber
a195c9a5af
truncate and display text in tooltip in custom repository fields
2017-06-15 15:08:33 +02:00
Luka Murn
3df034ff21
Merge pull request #687 from mz3944/mz-SCI-1357
...
Repository management - filter on custom columns [SCI-1357]
2017-06-15 13:30:42 +02:00
Mojca Lorber
ea455d3596
fix no repository name in activity bug
2017-06-15 09:43:10 +02:00
Matej Zrimšek
bae1e298d7
Fixed repositories search to only search the current repository. [SCI-1357]
2017-06-14 19:49:08 +02:00
Matej Zrimšek
092e82c722
Date search fix for repositories. [SCI-1357]
2017-06-14 19:36:15 +02:00
Matej Zrimšek
e38947b1f8
Minor repository search refactoring. [SCI-1357]
2017-06-14 19:28:53 +02:00
Matej Zrimšek
be4a8d494a
Search functionality added to custom columns of custom repositories. [SCI-1357]
2017-06-14 19:28:12 +02:00
mlorb
6e203d2f15
Merge pull request #685 from mlorb/ml_sci_1373
...
Fix bug with audit trail - ajax error [SCI-1373]
2017-06-14 17:59:34 +02:00
Zmago Devetak
ab24414bfe
Merge pull request #686 from ZmagoD/zd_SCI_1371
...
fixes bug with sorting columns [fixes SCI-1371]
2017-06-14 17:59:24 +02:00
zmagod
5d6fba7153
fixes bug with sorting columns [fixes SCI-1371]
2017-06-14 17:35:41 +02:00
okriuchykhin
374270bb10
Merge pull request #684 from okriuchykhin/ok_SCI_1349
...
Fix sorting in repositories when only assigned selected [SCI-1349]
2017-06-14 15:15:03 +02:00
Mojca Lorber
107aa76e55
fix bug with audit trail - ajax error
2017-06-14 14:48:22 +02:00
Oleksii Kriuchykhin
13fdbf8850
Fix sorting in repositories when only assigned selected [SCI-1349]
2017-06-14 14:29:59 +02:00
Mojca Lorber
e6ec184dba
fix multiple errors handling on fields in repositories tables
2017-06-14 13:09:23 +02:00
zmagod
2d3b5f4308
refactor
2017-06-14 10:55:24 +02:00
okriuchykhin
da87a41c86
Merge pull request #680 from okriuchykhin/ok_SCI_1365
...
Remove row selection after assign/unassign in repositories [SCI-1365]
2017-06-14 10:19:09 +02:00
zmagod
6dd85d6c39
fixes drag'n drop bug in results on safari [fixes SCI-1370]
2017-06-14 09:45:49 +02:00
zmagod
cee052fc19
added service object
2017-06-14 09:11:20 +02:00
Matej Zrimšek
cea6d15d3e
Fixed Hound warning. [SCI-1351]
2017-06-13 18:15:47 +02:00
Matej Zrimšek
1bc46fe0cb
Reverted the part of the repository row controller code that didn't needed changes. [SCI-1351]
2017-06-13 18:12:42 +02:00
Mojca Lorber
849b269d87
fix errors in repo table
2017-06-13 16:56:34 +02:00
Oleksii Kriuchykhin
2e98433abc
Remove row selection after assign/unassign in repositories [SCI-1365]
2017-06-13 16:56:28 +02:00
okriuchykhin
97a94ff4a3
Merge pull request #679 from okriuchykhin/ok_SCI_1345
...
Fix repository view permissions for team guests [SCI-1345]
2017-06-13 15:47:44 +02:00
mlorb
074a47aae1
Merge pull request #675 from mlorb/ml_sci_1272
...
Fix permissions [SCI-1272]
2017-06-13 10:51:04 +02:00
Oleksii Kriuchykhin
2d693a3fb7
Fix repository view permissions for team guests [SCI-1345]
2017-06-13 10:33:08 +02:00
Luka Murn
2e2f07bf58
Merge pull request #668 from Ducz0r/lm-sci-1335
...
Fix sidebar for repositories [SCI-1335]
2017-06-13 09:37:33 +02:00
Zmago Devetak
f3f1a68070
Merge pull request #667 from ZmagoD/zd_SCI_1338
...
fixes long column names in repository dropdown [fixes SCI-1338]
2017-06-13 09:33:04 +02:00
Zmago Devetak
19adddbfdb
Merge pull request #666 from ZmagoD/zd_SCI_1337
...
truncate long repository names [fixes SCI-1337]
2017-06-13 09:32:43 +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
Oleksii Kriuchykhin
4b0d7acabe
Fix search when viewing only assigned repository records [SCI-1342]
2017-06-13 09:11:27 +02:00
Luka Murn
c3d289291f
Fix case statement
...
Closes SCI-1335.
2017-06-13 09:09:07 +02:00
okriuchykhin
d88de4009a
Merge pull request #674 from okriuchykhin/ok_SCI_1346
...
Fix reordering columns to the first position [SCI-1346]
2017-06-13 09:01:10 +02:00
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
mlorb
d0d7dc7468
Merge pull request #677 from mlorb/ml_sci_1344
...
Change custom repositories icon [SCI-1344]
2017-06-13 08:57:22 +02:00
Zmago Devetak
6cdf37041f
Merge pull request #663 from ZmagoD/zd_SCI_1328
...
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-13 08:57:09 +02:00
Luka Murn
28f78a0c6c
Merge pull request #670 from Ducz0r/lm-sci-1340
...
Fix assigned repository rows in task display [SCI-1340]
2017-06-13 08:55:55 +02:00
zmagod
a865253a2e
first run
2017-06-13 08:10:10 +02:00
Mojca Lorber
faa6456e28
change custom repositories icon
2017-06-12 18:00:28 +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
Mojca Lorber
9108102b42
fix permissions
2017-06-12 17:34:36 +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
4ea8972a6c
Fixed rebasing mistake. [SCI-1275]
2017-06-09 19:48:20 +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
Matej Zrimšek
f46d8f6970
Refactored a bit repository records CSV export. Fixed the order of CSV rows to match the currently viewed datatable order. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
773a55ffac
Fixed CSV export of repository records. [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
Luka Murn
90ca6d9a76
Fix assigned repository rows in task display
...
Closes SCI-1340.
2017-06-09 13:50:13 +02:00
Luka Murn
481a48c953
Hound is love, Hound is life
2017-06-09 12:51:33 +02:00
Luka Murn
cfb734704e
Fix sidebar for repositories
...
Closes SCI-1335.
2017-06-09 12:49:23 +02:00
zmagod
d1977d0773
fixes long column names in repository dropdown [fixes SCI-1338]
2017-06-09 11:42:38 +02:00
zmagod
ee9eaea47c
truncate long repository names [fixes SCI-1337]
2017-06-09 11:20:57 +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
Luka Murn
c7c3c46d9d
Fix dropdown
2017-06-08 15:26:57 +02:00
Mojca Lorber
be52af4e4f
fix rename/delete/copy modals not working
2017-06-08 15:13:00 +02:00
Mojca Lorber
0004c2b7d5
fix selection of tab after redirection
2017-06-08 14:17:27 +02:00
zmagod
5f8606c9c5
removes the delete function of uncompleted steps [fixes SCI-1315]
2017-06-08 14:03:06 +02:00
Mojca Lorber
71c523c406
load tabs with javascript
2017-06-08 13:47:30 +02:00
zmagod
e45c2ce560
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-08 13:41:27 +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
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
61eb52f86f
Implement GUI for copying repositories
...
Closes SCI.1270.
2017-06-07 19:11:25 +02:00
Luka Murn
38361e4bb4
Setup initial GUI
2017-06-07 18:43:48 +02:00
Luka Murn
b94d2c5c03
Implement 'copy' method on Repository object
2017-06-07 18:28:07 +02:00
Luka Murn
0aee11d6d8
Hound is love, Hound is life #2
2017-06-07 18:26:32 +02:00
Luka Murn
42f7b4f68d
Hound is love, Hound is life
2017-06-07 18:22:15 +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
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
c18bba9fbe
Fix rebase errors [SCI-1274]
2017-06-07 15:50:22 +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
353c27da15
rename method
2017-06-07 13:51:16 +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
dde714d78f
fix hound
2017-06-06 13:33:57 +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
acdea2198d
code changes after rebasing
2017-06-06 11:10:55 +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
eb95ec74a3
Merge pull request #654 from Ducz0r/lm-sci-1323
...
Fix bug with protocol preview modal not working in protocol repo [SCI-1323]
2017-06-06 08:02:33 +02:00
Luka Murn
f382c04f01
Refactor JS code a bit
...
Closes SCI-1323.
2017-06-06 08:02:01 +02:00
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
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
cb1ad9e0be
Merge pull request #555 from ZmagoD/zd_SCI_1103
...
adds additional explanations [fixes SCI-1103]
2017-04-13 15:15:08 +02:00
zmagod
0987cf8abc
fixes hound alerts
2017-04-13 14:55:18 +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
mlorb
ddc0e86c92
Merge pull request #556 from mlorb/ml_sci_1174
...
Fix bug with changing user own role from admin to normal user [SCI-1174]
2017-04-13 14:33:58 +02:00
Zmago Devetak
ec60044949
Merge pull request #548 from ZmagoD/zd_SCI_1129_v2
...
Disables annimateSpiner in result assets actions
2017-04-13 14:06:50 +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
zmagod
f104444a0c
adds additional explanations [fixes SCI-1103]
2017-04-12 16:56:47 +02:00
Mojca Lorber
27c661d7c4
fix bug with changing user own role from admin to normal user
2017-04-12 16:56:10 +02:00
Oleksii Kriuchykhin
181d981a51
Add image preview to protocol repository [SCI-877]
2017-04-12 16:05:38 +02:00
mlorb
2932052628
Merge pull request #549 from mlorb/ml_sci_1172
...
Fix overlapping text in audit trail table [SCI-1172, SCI-1181]
2017-04-12 15:10:48 +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
Zmago Devetak
9c31239318
Merge pull request #552 from biosistemika/release-1.9.0
...
Release 1.9.1
2017-04-12 13:08:37 +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
Mojca Lorber
b09c18a9bc
fix overlaping text in audit trail table
2017-04-11 14:29:31 +02:00
zmagod
929d8aab5e
disables annimateSpiner in result assets actions
2017-04-10 15:40:36 +02:00
Zmago Devetak
91793c295a
Merge pull request #542 from ZmagoD/zd_SCI_825
...
Smart annotations and Notifications
2017-04-10 15:10:17 +02:00
zmagod
90faeec410
fixes typos and protocol step links
2017-04-10 11:21:28 +02:00
Zmago Devetak
ccb6cd0c8c
Merge pull request #546 from ZmagoD/zd_SCI_1185
...
adds input_sanitizer helper in app mailer [fixes SCI-1185]
2017-04-10 09:12:03 +02:00
Luka Murn
cd4664e4d0
Merge pull request #544 from Ducz0r/lm-sci-794-fix
...
Only require jquery-ui-sortable on samples page [SCI-794]
2017-04-10 07:44:57 +02:00
mz3944
2c78d10768
Merge pull request #532 from biosistemika/mz-SCI-1150
...
Fixed so that file deletion callbacks are triggered
2017-04-07 15:18:43 +02:00
zmagod
122e638b7e
adds input_sanitizer helper in app mailer [fixes SCI-1185]
2017-04-07 15:01:26 +02:00
Luka Murn
becdd687a6
Only require jquery-ui-sortable on samples page
...
(hopefully) closes SCI-794.
2017-04-07 13:05:22 +02:00
zmagod
9610c5f5a0
fix info dropdown links [fixes SCI-1141]
2017-04-07 11:31:09 +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
okriuchykhin
aa776aaa71
Merge pull request #541 from okriuchykhin/ok_SCI_615
...
Fix moving of the steps after adding a new one [SCI-615]
2017-04-06 15:50:01 +02:00
zmagod
e77df92017
fix samples_controller
2017-04-06 15:26:24 +02:00
zmagod
9bb1bb3f9b
refactor [fixes SCI-825]
2017-04-06 15:08:03 +02:00
zmagod
439cd0cd89
add notification to experiments
2017-04-06 14:55:18 +02:00
zmagod
046b608018
add notification for my_module/project comments
2017-04-06 14:07:22 +02:00
zmagod
b398bb7516
add step annotations methods in steps_action concerns
2017-04-06 13:06:20 +02:00
zmagod
f16607579f
refactor steps annotation
2017-04-06 13:03:13 +02:00
Oleksii Kriuchykhin
5c0197220d
Fix moving of the steps after adding a new one [SCI-615]
2017-04-06 12:53:21 +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
mlorb
4855111dcb
Merge pull request #540 from mlorb/ml_sci_1089_v2
...
Remove ERROR from message [SCI-1089]
2017-04-06 10:44:20 +02:00
zmagod
bb437bd8c5
adds notification to results annotation
2017-04-06 09:33:49 +02:00
zmagod
d331911ffe
completed step annotations
2017-04-06 08:42:16 +02:00
mlorb
e9441559d3
Merge pull request #538 from mlorb/ml_sci_1044_vol3
...
Change helper method for user info popover
2017-04-05 17:04:30 +02:00
Mojca Lorber
5e62046627
remove ERROR from message
2017-04-05 14:40:55 +02:00
mlorb
7730493ef4
Merge pull request #535 from biosistemika/ml_sci_1044_vol2
...
Fix bug with constants
2017-04-04 15:46:50 +02:00
Mojca Lorber
b222a34a97
fix hound
2017-04-04 15:38:16 +02:00
Mojca Lorber
a0fe47a05d
change helper method for user info popover
2017-04-04 15:22:41 +02:00
okriuchykhin
8cff0a9a5b
Merge pull request #534 from okriuchykhin/ok_SCI_1127_v2
...
Add user popover method for users [SCI-1127]
2017-04-04 14:36:16 +02:00
zmagod
99c116f257
first run
2017-04-04 09:19:43 +02:00
Mojca Lorber
715fafe58c
fix bug with constants
2017-04-03 17:07:58 +02:00
Oleksii Kriuchykhin
2faa137f67
Add user popover method for users [SCI-1127]
2017-04-03 15:10:00 +02:00
zmagod
e1ee53eeb5
generates query in background worker
2017-04-03 13:37:54 +02:00
mlorb
317739af1e
Merge pull request #530 from biosistemika/ml_sci_1044
...
Add data-hook and yadcf-filter plug-in [SCI-1044]
2017-03-31 14:00:23 +02:00
Mojca Lorber
a2c1ed6994
fix constants
2017-03-31 13:53:18 +02:00
Mojca Lorber
503ee5b62e
change place of data-hook
2017-03-30 17:21:29 +02:00
Oleksii Kriuchykhin
42ccefe2ce
Remove logs table and old unused logging code [SCI-1127]
2017-03-30 11:47:57 +02:00
Mojca Lorber
9458f391e5
add data-hook and yadcf-filter plug-in
2017-03-29 15:59:51 +02:00
Zmago Devetak
2b35b34eb8
Merge pull request #529 from ZmagoD/zd_SCI_1135
...
fixes alert messages in samples [fixes SCI-1135]
2017-03-29 14:57:11 +02:00
Zmago Devetak
0019fd19ea
Merge pull request #525 from ZmagoD/zd_SCI_765
...
Export large files - utility class
2017-03-29 11:55:51 +02:00
zmagod
0096f9dc14
refactor
2017-03-29 09:32:23 +02:00
okriuchykhin
05a49e5a82
Merge pull request #528 from okriuchykhin/ok_SCI_1133
...
Fix secondary navigation on Mac [SCI-1133]
2017-03-29 09:30:34 +02:00
zmagod
9ce95470b3
fixes alert messages in samples [fixes SCI-1135]
2017-03-28 15:14:05 +02:00
Oleksii Kriuchykhin
391c5af267
Fix secondary navigation on Mac [SCI-1133]
2017-03-28 14:36:52 +02:00
zmagod
7039420f99
add hook to canvas module actions
2017-03-28 10:43:39 +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
2235fd3fb7
adds view if download expires
2017-03-27 10:38:28 +02:00
mlorb
3beb179f87
Merge pull request #514 from biosistemika/ml_sci_1089
...
Add error messages to sample group/type edit/delete actions [SCI-1089]
2017-03-27 09:57:32 +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
okriuchykhin
71dc6921fb
Merge pull request #524 from okriuchykhin/ok_SCI_1046
...
Add team_id field to assets and tables [SCI-1046]
2017-03-24 14:48:16 +01:00
Oleksii Kriuchykhin
d2c8e9a395
Set team for assets and tables in generators [SCI-1046]
2017-03-24 14:46:20 +01:00
Zmago Devetak
804fb2fec9
Merge pull request #519 from ZmagoD/zd_SCI_1092_v2
...
adds hooks in team switch [fixes SCI-1092]
2017-03-24 12:56:52 +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
okriuchykhin
33544ec91d
Merge pull request #521 from okriuchykhin/ok_SCI_1087
...
Move flash message creation JS code to helper method [SCI-1087]
2017-03-20 15:35:21 +01:00
Zmago Devetak
38299d9f67
Merge pull request #522 from ZmagoD/zd_SCI_1111
...
fixes breadcrumbs in office file [fixes SCI-1111]
2017-03-20 13:53:29 +01:00
zmagod
d8955d1a78
fixes breadcrumbs in office file [fixes SCI-1111]
2017-03-20 13:48:45 +01:00
Oleksii Kriuchykhin
c715902058
Move flash message creation JS code to helper method [SCI-1087]
2017-03-17 17:58:53 +01:00
Mojca Lorber
83fa8570d7
refactoring
2017-03-17 17:52:15 +01:00
zmagod
c244e69e81
fixed report comments bug [fixes SCI-1100]
2017-03-17 16:59:40 +01:00
zmagod
5cc6cd094e
refactor
2017-03-17 16:47:58 +01:00
zmagod
95a0f596b7
adds file link
2017-03-17 16:40:57 +01:00
zmagod
70f17a924e
adds hooks in team switch [fixes SCI-1092]
2017-03-17 16:10:22 +01:00
zmagod
52878e0989
fixed wopi buttons [fixes SCI-1110]
2017-03-16 15:38:11 +01:00
zmagod
307fef17d8
fixes owner id if empty
2017-03-15 18:01:15 +01:00
Zmago Devetak
1afb4c9a42
Merge pull request #515 from ZmagoD/file_owner_id_bug
...
fixes bug with wopi contorller
2017-03-15 17:40:07 +01:00
zmagod
c5156f5ca3
fixes bug with wopi contorller
2017-03-15 17:33:36 +01:00
Mojca Lorber
4792bd87b9
fix error message when editing custom column on locked task
2017-03-15 14:09:44 +01:00
Mojca Lorber
7a4e3201e7
add error messages to sample group/type edit/delete actions
2017-03-14 17:32:25 +01:00
zmagod
5d372851d3
fixes reports comment bug [fixes SCI-1100]
2017-03-14 16:24:02 +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
15b1712a3d
fixes bug with organization
2017-03-14 13:29:59 +01:00
zmagod
b821fff4a5
adds non breaking space between file name and buttons
2017-03-13 14:14:44 +01:00
zmagod
df2abe5d17
fixed typo
2017-03-13 13:51:31 +01:00
zmagod
7b16e5643e
fix assets preprocesor for wopi files
2017-03-13 13:20:49 +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
mlorb
39e1ac4b26
Merge pull request #512 from biosistemika/ml_sci_1074
...
Fix permissions for experiment actions [SCI-1074]
2017-03-10 11:44:27 +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
Mojca Lorber
1ba5f1748f
fix permissions for experiment actions
2017-03-09 17:45:34 +01:00
Oleksii Kriuchykhin
456934464a
Remove unneeded validation calls [SCI-1090]
2017-03-09 17:20:27 +01:00
zmagod
1d42d46c02
fixes bug with step comments
2017-03-09 16:02:52 +01:00
Luka Murn
ae96223437
Fix rake db:add_user task
2017-03-09 15:37:15 +01:00
zmagod
3057965940
fix bug with filenames
2017-03-09 11:48:50 +01:00
zmagod
9939d8df06
refactor
2017-03-09 10:51:54 +01:00
Luka Murn
1e3a697a91
Merge pull request #508 from biosistemika/lm-sci-838-fix
...
Open edit/view Office files in new browser tab/window [SCI-838]
2017-03-09 10:39:16 +01:00
zmagod
49f91184da
fixes locals
2017-03-09 09:55:15 +01:00
Luka Murn
a4bf5516a5
Merge pull request #505 from Ducz0r/lm-sci-1082-fix
...
Minor change [SCI-1082]
2017-03-09 08:58:14 +01:00
Luka Murn
0e8f5f8e99
Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix
...
Conflicts:
app/views/my_modules/_state_buttons.html.erb
2017-03-09 08:44:09 +01:00
zmagod
f78ef8c82a
fixes hound
2017-03-08 14:41:42 +01:00
zmagod
5c2e9a4b04
adds extends and fixes report methods
2017-03-08 14:14:03 +01:00
Luka Murn
800df7a26b
Also make button icons work when rendering them via JS
...
Closes SCI-1073.
2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin
0f8336e5a5
Refactoring of the comments using STI [SCI-1090]
2017-03-08 13:18:20 +01:00
Luka Murn
7c9aa2e476
Hide complete&uncomplete task buttons if user cannot do it
...
Closes SCI-1091.
2017-03-06 16:01:04 +01:00
Luka Murn
86a800a84e
Open edit/view Office files in new browser tab/window
...
Closes SCI-838.
2017-03-06 14:12:18 +01:00
Luka Murn
473487faec
Add HTML <head><title> to edit, view file pages
...
Closes SCI-1049.
2017-03-06 13:55:07 +01:00
Luka Murn
4ddb139911
Fix padding of state buttons
...
Closes SCI-1073.
2017-03-03 16:36:52 +01:00
Luka Murn
42b773f180
Merge pull request #504 from Ducz0r/lm-sci-1078-fix
...
Fix sample type groups edit color script [SCI-1078]
2017-03-02 13:09:51 +01:00
Luka Murn
043613782e
Minor change
2017-03-02 13:04:13 +01:00
Luka Murn
808fdf6744
Merge pull request #502 from Ducz0r/lm-sci-1073-fix
...
Fix protocol state buttons a bit [SCI-1073]
2017-03-02 09:02:52 +01:00
Luka Murn
7a48da2e94
Merge pull request #501 from Ducz0r/lm-sci-1057-fix
...
Canvas should now properly work again [SCI-1057]
2017-03-02 09:01:51 +01:00
Luka Murn
3599537e42
Fix sample type groups edit color script so it works properly now
...
Closes SCI-1078.
2017-03-01 09:09:44 +01:00
Oleksii Kriuchykhin
4868ec5331
Remove task completion duplicated code [SCI-1075]
2017-02-28 17:07:59 +01:00
Luka Murn
3d7f09bde6
Fix protocol state buttons a bit
...
Closes SCI-1073.
2017-02-28 14:35:12 +01:00
Luka Murn
2252b46afc
Canvas should now properly work again
...
Closes SCI-1057.
2017-02-28 10:41:55 +01:00
zmagod
e1b3dcc2ba
adds enum extends to report element part of SCI-1003
2017-02-27 13:53:46 +01:00
Luka Murn
fecfc9e41d
Merge pull request #498 from biosistemika/release-1.8.1
...
Release 1.8.1
2017-02-23 14:57:30 +01:00
Luka Murn
dc89c160be
Fix a bug with team page not working from user task modal
2017-02-23 14:45:00 +01:00
Luka Murn
87599dca88
Merge branch 'lm-sci-1026-fix' into release-1.8.1
2017-02-23 13:55:41 +01:00
mlorb
a72a072fac
Merge pull request #495 from mlorb/ml_sci_948
...
Fix report - checklist items are in separate row than checkboxes [SCI-948]
2017-02-23 10:50:48 +01:00
okriuchykhin
986ad051a1
Merge pull request #496 from okriuchykhin/ok_SCI_873
...
Improve image scaling in image preview [SCI-873]
2017-02-23 09:30:56 +01:00
Oleksii Kriuchykhin
cb588ed378
Improve image scaling in image preview [SCI-873]
2017-02-22 16:55:57 +01:00
okriuchykhin
d30e149936
Merge pull request #493 from okriuchykhin/ok_SCI_739
...
Lower z-index value for notification count icon [SCI-739]
2017-02-22 16:48:39 +01:00
okriuchykhin
75792cde14
Merge pull request #492 from okriuchykhin/ok_SCI_759
...
Add more extensive explanation when project name is already taken [SCI-759]
2017-02-22 16:25:16 +01:00
Mojca Lorber
f84611f558
fix report - checklist items are in separate row than checkboxes
2017-02-22 15:51:26 +01:00
Oleksii Kriuchykhin
a326fa374f
Lower z-index value for notification count icon [SCI-739]
2017-02-22 14:35:07 +01:00
Zmago Devetak
58f97fdb5b
Merge pull request #489 from ZmagoD/zd_SCI_1002_add_hook
...
adds hook for lock task action
2017-02-22 14:24:01 +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
mlorb
b65c716b79
Merge pull request #491 from biosistemika/ml_sci_1028_v2
...
Fix repeat tutorial is always created on the same team [SCI-1028]
2017-02-22 13:52:46 +01:00
Mojca Lorber
330fe9c291
fix repeat tutorial is always created on the same team
...
Closes SCI-1028.
2017-02-22 13:43:03 +01:00
mlorb
42e6a99911
Merge pull request #487 from mlorb/ml_sci_1032
...
Fix visual bug in edit avatar mode [SCI-1032]
2017-02-22 10:59:18 +01:00
mlorb
8c111db31a
Merge pull request #486 from mlorb/ml_sci_1033
...
Fix user has no teams view [SCI-1033]
2017-02-22 10:58:39 +01:00
zmagod
151dc79a81
adds hook for lock task action
2017-02-21 16:25:50 +01:00
Mojca Lorber
ac0988ef32
add data-hooks for remove manage teams button
2017-02-21 15:39:08 +01:00
Mojca Lorber
0fd41e8a6d
remove changes on user has no teams view
2017-02-21 15:12:58 +01:00
Oleksii Kriuchykhin
53ba9437b2
Fix circular dependency while loading Settings [SCI-1004]
2017-02-21 14:38:13 +01:00
mlorb
ea1711be83
Merge pull request #485 from mlorb/ml_sci_1001
...
Add data-hook for E-signature manifestation/display [SCI-1001]
2017-02-21 14:25:08 +01:00
mlorb
01d9f306a5
change div to span
2017-02-21 14:22:28 +01:00
Mojca Lorber
6b30f097f0
fix visual bug in edit avatar mode
2017-02-21 14:02:42 +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
Mojca Lorber
90864a45a0
fix user has no teams view
2017-02-21 13:08:06 +01:00
Oleksii Kriuchykhin
7703db3386
Change implementation of the Settings base class [SCI-1004]
2017-02-21 13:07:10 +01:00
Luka Murn
6f1c19ae2d
Fix _user_dropdown.html.erb
2017-02-21 09:27:42 +01:00
Mojca Lorber
cb2127ee7f
add data-hook for E-signature manifestation/display
2017-02-20 18:03:55 +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
Luka Murn
573f3c8d42
Merge pull request #483 from Ducz0r/lm-sci-1026-fix
...
Fix manage project users modal bug [SCI-1026]
2017-02-20 08:22:03 +01:00
Luka Murn
ce617894c5
Fix manage project users modal bug
...
Closes SCI-1026.
2017-02-16 15:29:58 +01:00
Oleksii Kriuchykhin
4fb5fa79af
Move task completion activity and notification creation to separate methods [SCI-999]
2017-02-16 13:36:05 +01:00
Oleksii Kriuchykhin
218e96b1f0
Code style fixes [SCI-999]
2017-02-16 11:45:07 +01:00
Zmago Devetak
c963674e49
Merge pull request #482 from ZmagoD/zd_SCI_987_vol2
...
fixes bug with user teams table [fixes SCI-987]
2017-02-15 13:30:25 +01:00
Luka Murn
164bd787e9
Merge pull request #481 from Ducz0r/lm-sci-958-fix
...
Team administrators are Viewers of all Projects in Team [SCI-958]
2017-02-15 10:40:52 +01:00
zmagod
836baa7412
fixes bug with user teams table [fixes SCI-987]
2017-02-15 10:06:21 +01:00
Nbernot
97584aabb3
Updated the lists of office online file extensions
...
Extended the list of file extensions that receive office online icons and 'open in' text.
2017-02-14 16:44:03 +01:00
Luka Murn
d097f0dd15
Merge pull request #477 from Ducz0r/lm-sci-928
...
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
2017-02-13 16:42:57 +01:00
Luka Murn
1b6f50647c
Please Hound
2017-02-13 16:40:27 +01:00
Luka Murn
b369177d1f
Merge pull request #480 from Ducz0r/lm-sci-964-fix
...
Fix system notification email links not working bug [SCI-964]
2017-02-13 16:31:04 +01:00
Oleksii Kriuchykhin
f97c20e9b5
Fix hound warnings [SCI-999]
2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin
78d5cbb223
Add links to task completion notification [SCI-999]
2017-02-13 14:51:21 +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
Luka Murn
f93cc89624
Fix system notification email links not working bug
...
Closes SCI-964.
2017-02-10 15:13:33 +01:00
Oleksii Kriuchykhin
cf8566df33
Add task complete/uncomplete functionality [SCI-999]
2017-02-10 14:27:20 +01:00
Luka Murn
3eb4faa44b
Fix task restore action
...
Closes SCI-991.
2017-02-10 14:08:56 +01:00
Luka Murn
280b7a0e75
Minor fix
2017-02-09 15:10:45 +01:00
Luka Murn
2a9f975c13
Some minor fixes
2017-02-09 14:58:11 +01:00
Luka Murn
f7bd62547e
Refactor teams settings into its own controllers
2017-02-09 14:37:59 +01:00
Luka Murn
7bee3a4ea0
Move user profile to settings
2017-02-09 11:34:52 +01:00
Luka Murn
5cb3eb5e09
Refactor preferences -> move them to subcontroller, subroute
2017-02-09 11:07:16 +01:00
okriuchykhin
c2a69982aa
Merge pull request #471 from okriuchykhin/ok_SCI_936
...
Adds datatable to all teams page [SCI-936]
2017-02-07 10:33:33 +01:00
okriuchykhin
e2de3c92e7
Merge pull request #472 from okriuchykhin/ok_SCI_984
...
Check that user is a member of a team when switching to it [SCI-984]
2017-02-07 09:36:46 +01:00
okriuchykhin
53ff6a2893
Merge pull request #473 from okriuchykhin/ok_SCI_997
...
Fix smart annotation is missing at editing column with smart annotation [SCI-997]
2017-02-07 09:33:40 +01:00
Oleksii Kriuchykhin
80dbc669d0
Simplify all teams dt definition [SCI-936]
2017-02-06 17:17:48 +01:00
Oleksii Kriuchykhin
449f4479e9
Fix code style issues [SCI-936]
2017-02-06 17:08:20 +01:00
zmagod
c99a540eb3
adds hook to team name in the invitation template [fixes SCI-930]
2017-02-03 16:53:42 +01:00
Oleksii Kriuchykhin
916ed2572a
Fix smart annotation is missing at editing column with smart annotation [SCI-997]
2017-02-03 16:42:38 +01:00
Oleksii Kriuchykhin
cc6b518c7f
Check that user is a member of a team when switching to it [SCI-984]
2017-02-03 16:10:37 +01:00
Oleksii Kriuchykhin
62535a01bd
Move teams datatable js code into separate file [SCI-936]
2017-02-03 10:44:42 +01:00
Oleksii Kriuchykhin
8b105aa030
Add override hooks [SCI-936]
2017-02-02 23:35:47 +01:00
Zmago Devetak
65bbd81497
Merge pull request #469 from ZmagoD/zd_SCI_929
...
Adds hook in user settings navigation
2017-02-02 15:01:37 +01:00
mlorb
970d99e6e3
Merge pull request #465 from mlorb/ml_sci_937
...
Redesign of individual team page [SCI-937]
2017-02-02 11:15:55 +01:00
mlorb
5510fa7751
rename data-hooks in team view
2017-02-02 10:36:23 +01:00
Oleksii Kriuchykhin
db90c5d63b
Add datatable to all teams page [SCI-936]
2017-02-02 09:53:59 +01:00
zmagod
bb42bd04a5
adds hook in user settings navigation
2017-02-01 17:10:22 +01:00
Mojca Lorber
86351ce17d
add data-hooks for billing
2017-02-01 15:01:54 +01:00
Mojca Lorber
d3e0eca44e
redesign individual team page
2017-02-01 14:44:47 +01:00
Oleksii Kriuchykhin
031741d122
Disable protocols link if user has no teams [SCI-934]
2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin
c119b7c014
Make sciNote work for users without any teams [SCI_934]
2017-02-01 14:16:26 +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
okriuchykhin
067b9452a4
Merge pull request #464 from okriuchykhin/ok_SCI_935
...
Add config option to enable/disable users registration [SCI-935]
2017-02-01 09:36:36 +01:00
Luka Murn
059f9cfb25
Merge pull request #468 from biosistemika/hotfix-1.7.2
...
Change URLs to sciNote help pages [SCI-978]
2017-01-31 16:15:39 +01:00
Luka Murn
db75231617
Update URLs to sciNote support pages
...
Closes SCI-978.
2017-01-31 15:48:56 +01:00
zmagod
be5faad97c
fixes hound
2017-01-31 13:33:55 +01:00
Oleksii Kriuchykhin
d1e69438de
Add config option to enable/disable users registration [SCI-935]
2017-01-30 15:04:02 +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
okriuchykhin
9909f9dcff
Merge pull request #456 from okriuchykhin/ok_SCI_951
...
Fix missing preview images in task and protocol management [SCI-951]
2017-01-27 14:42:41 +01:00
okriuchykhin
c6fe0003f4
Merge pull request #458 from okriuchykhin/ok_SCI_957
...
Fix protocol table filtering by keywords [SCI-957]
2017-01-27 14:19:53 +01:00
okriuchykhin
53e09bd50a
Merge pull request #457 from okriuchykhin/ok_SCI_955
...
Fix comments re-initialization after edit of the results [SCI-955]
2017-01-27 11:50:52 +01:00
zmagod
e59b2e039a
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939
2017-01-27 11:15:31 +01:00
zmagod
61b260fb8a
fixes bug in protocol management
2017-01-27 11:01:44 +01:00
mlorb
77236f161b
Merge pull request #461 from mlorb/ml_sci_952
...
Fix bug with avatar in smart annotations [SCI-952]
2017-01-27 10:08:53 +01:00
Luka Murn
2c3be391a8
Merge pull request #462 from ZmagoD/zd_SCI_962_vol2
...
fix edit action
2017-01-26 17:25:57 +01:00
Luka Murn
36f25e98f1
Merge pull request #459 from okriuchykhin/ok_SCI_943
...
Fix RTF toolbar init after eding new step [SCI-943]
2017-01-26 17:25:41 +01:00
zmagod
30912c514e
fix edit action
2017-01-26 17:24:24 +01:00
Mojca Lorber
5bed5f0f4a
fix bug with avatar in smart annotations
2017-01-26 17:15:00 +01:00
zmagod
cec5f1333d
fixes RTE bug for new text results [fixes SCI-962]
2017-01-26 16:54:43 +01:00
Oleksii Kriuchykhin
100cc700c6
Fix RTF toolbar init after eding new step [SCI-943]
2017-01-26 16:37:44 +01:00
Luka Murn
3bf447b0f4
Fix bug where reCaptcha form wasn't working
2017-01-26 16:06:29 +01:00
Oleksii Kriuchykhin
17a53cbd7f
Fix protocol table filtering by keywords [SCI-957]
2017-01-26 15:52:46 +01:00
Oleksii Kriuchykhin
ff86184b24
Fix comments re-initialization after edit of the results [SCI-955]
2017-01-26 15:24:37 +01:00
Oleksii Kriuchykhin
0f860496a7
Fix image preview after saving of report [SCI-951]
2017-01-26 14:42:14 +01:00
Luka Murn
3e6d11a087
Merge pull request #455 from mlorb/ml_sci_944
...
Fix entering new smart anotations [SCI-944]
2017-01-26 14:06:35 +01:00
Mojca Lorber
13d1cc5171
fix entering new smart anotations
2017-01-26 13:50:32 +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
Luka Murn
0baaf12de3
Re-display images & checkboxes in PDF reports
...
Closes SCI-953.
2017-01-26 10:46:58 +01:00
Luka Murn
8c5a52417c
Merge pull request #445 from okriuchykhin/ok_SCI_940
...
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:49:38 +01:00
okriuchykhin
648d256dff
Merge pull request #448 from okriuchykhin/ok_SCI_945
...
Fix openning of protocol preview with images [SCI-945]
2017-01-25 17:27:01 +01:00
okriuchykhin
6610c75bfc
Merge pull request #452 from okriuchykhin/ok_SCI_949
...
Fix error when referencing deleted sample in SA [SCI-949]
2017-01-25 17:26:48 +01:00
Oleksii Kriuchykhin
c55f3cb99c
Add flag to disable simple_format in custom_auto_link [SCI-940]
2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin
310d8c1920
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:18:19 +01:00
mlorb
bedef297c4
Merge pull request #453 from mlorb/ml_sci_950
...
Fix problem with protocol export [SCI-950]
2017-01-25 17:15:21 +01:00
okriuchykhin
4c0f68ffbd
Merge pull request #410 from okriuchykhin/ok_SCI_855
...
Improved tooltip handling in samples datatable V2 [SCI-855]
2017-01-25 16:19:52 +01:00
Mojca Lorber
99a40961fa
fix problem with protocol export
2017-01-25 16:12:48 +01:00
Oleksii Kriuchykhin
5fe9261595
Fix error when referencing deleted sample in SA [SCI-949]
2017-01-25 15:54:12 +01:00
zmagod
a507bb4d1f
hound
2017-01-25 15:40:35 +01:00
zmagod
1220466035
fixing hound
2017-01-25 15:00:14 +01:00
zmagod
afd8328e9c
rename ortanizations -> teams
2017-01-25 14:22:06 +01:00
Oleksii Kriuchykhin
ddd8bcf7b0
Prevent double initialization of popup [SCI-855]
2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin
96a9857dec
Add handling of popups in the end of the table [SCI-855]
2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin
fb49ce8be2
Improved tooltip handling in samples datatable [SCI-855]
2017-01-25 13:47:01 +01:00
Mojca Lorber
6905fc8c08
remove letter f
2017-01-25 13:20:11 +01:00
Oleksii Kriuchykhin
90e4b26c69
Fix openning of protocol preview with images [SCI-945]
2017-01-25 13:06:12 +01:00
zmagod
f04a2f663a
renamed organizations in config/
2017-01-25 12:30:11 +01:00
zmagod
8c035a1981
renames organization in assets
2017-01-25 12:12:27 +01:00
okriuchykhin
35b8638598
Merge pull request #446 from okriuchykhin/ok_SCI_902_v2
...
Add sanitization of group/type to sample edit [SCI-902]
2017-01-25 12:05:30 +01:00
zmagod
72e13beee3
renamed organizations in views
2017-01-25 12:01:23 +01:00
Mojca Lorber
2277af534c
fix table titles
2017-01-25 11:01:35 +01:00
zmagod
a6285f0431
renamed utilities
2017-01-25 10:24:50 +01:00
zmagod
9ae799d52c
rename organization/org/Organization to Team in datatables
2017-01-25 09:48:49 +01:00
zmagod
9d90b9b42a
rename Organization to Team in models
2017-01-24 17:08:48 +01:00
zmagod
c2c5616078
rename Organization to Team in controllers
2017-01-24 17:06:51 +01:00
Oleksii Kriuchykhin
fe6d6842c2
Add sanitization of group/type to sample edit [SCI-902]
2017-01-24 16:58:03 +01:00
zmagod
21c2f82582
rename controllers where org/organization
2017-01-24 16:57:14 +01:00
zmagod
a193850ae6
rename models where org/organization
2017-01-24 16:34:21 +01:00
Oleksii Kriuchykhin
365eef506c
Fixes merge conflicts with smart-annotations branch
2017-01-24 15:20:50 +01:00
okriuchykhin
f1483e4cad
Merge pull request #444 from okriuchykhin/ok_SCI_902_v2
...
Add sanitization to sample groups/types [SCI-902]
2017-01-24 14:44:55 +01:00
Oleksii Kriuchykhin
a04f05eeb3
Add sanitization to sample groups/types [SCI-902]
2017-01-24 14:39:54 +01:00
mlorb
02f314ce60
Merge pull request #443 from mlorb/ml_sci_919_v2
...
Remove table of content and customize link target [SCI-919]
2017-01-24 14:39:47 +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
Mojca Lorber
4dc7998fdd
Remove table of content and customize link target
2017-01-24 13:10:01 +01:00
Zmago Devetak
40bf293ec7
Merge pull request #441 from ZmagoD/zd_SCI_924
...
adds smart annotation in task comments, refactor smart_annotation_par…
2017-01-24 11:18:41 +01:00
mlorb
4253e3de2b
Merge pull request #439 from mlorb/ml_sci_919
...
Remove functionalities from rich text formatting [SCI-919]
2017-01-24 11:03:34 +01:00
mz3944
34f832d123
Merge pull request #437 from mz3944/mz-sci-913
...
Added smart annotations when adding new sample in samples table [SCI-913]
2017-01-24 11:03:00 +01:00
okriuchykhin
7fa1f3d966
Merge pull request #438 from okriuchykhin/ok_SCI_921
...
Remove unneeded HTML scrubber in protocol importer [SCI-921]
2017-01-24 11:02:43 +01:00
Matej Zrimšek
b48e48e100
Prevent sample row in samples datatable from toggling when clicking on smart annotation link. [SCI-913]
2017-01-24 10:56:10 +01:00
zmagod
6e7fa21dd3
adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]
2017-01-24 10:51:12 +01:00
Matej Zrimšek
2e041d9e81
Added smart annotations when adding new sample in samples table. [SCI-913]
2017-01-24 10:23:26 +01:00
Oleksii Kriuchykhin
2434c73a0c
Remove unneeded HTML scrabber in protocol importer [SCI-921]
2017-01-24 09:52:38 +01:00
Mojca Lorber
eb40513ada
remove functionalities from rich text formatting
2017-01-24 09:44:37 +01:00
Oleksii Kriuchykhin
401b37956b
Simplify protocol export start [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
d555ba7905
Add export to protocol management page and code style improvements [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
14a6705b55
Implemented protocol export through Zip::OutputStream [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
1abd7fc574
Added xml schemas and zip gem [SCI-742]
2017-01-23 17:34:02 +01:00
Oleksii Kriuchykhin
69f31a62e7
Initial code commit [SCI-742]
2017-01-23 17:33:10 +01:00
Zmago Devetak
674999f987
Merge pull request #436 from ZmagoD/zd_SCI_922
...
fixed user without permissions bug [fixes SCI-922]
2017-01-23 17:25:07 +01:00
zmagod
20cde2654b
fixed user without permissions bug [fixes SCI-922]
2017-01-23 10:53:42 +01:00
zmagod
9c3bc8dac7
fixes checklist item user popover bug [fixes SCI-907]
2017-01-23 09:47:04 +01:00
mz3944
fd63a1de12
Merge pull request #432 from mlorb/ml-sci-fix-847
...
Add dynamic length for sample type/group field when adding new sample [SCI-847]
2017-01-20 15:46:34 +01:00
mlorb
2d073c8c04
Merge pull request #430 from mlorb/ml_sci_826
...
Display smart annotations in reports [SCi-826]
2017-01-20 13:49:40 +01:00
Mojca Lorber
8e02c2e025
add locale - fix
2017-01-20 13:37:07 +01:00
mz3944
18a2e4c423
Merge pull request #433 from mz3944/mz-sci-914
...
Edit of a sample in sample table does not work
2017-01-20 13:02:05 +01:00
Zmago Devetak
c1e7cc83a7
Merge pull request #434 from ZmagoD/zd_SCI_915
...
Text is deleted when entering smart annotation in rich text editor
2017-01-20 13:01:29 +01:00
Zmago Devetak
7bd368e002
Merge pull request #431 from ZmagoD/zd_add_code_highlight
...
Fixes code highlight and smart annotations experiments bug
2017-01-20 12:59:21 +01:00
mlorb
9a3c56de97
Merge pull request #421 from mlorb/ml_sci_540
...
Protocol steps/results - adding titles for tables [SCI-540]
2017-01-20 11:41:49 +01:00
zmagod
71453398b1
bugfix
2017-01-20 11:33:49 +01:00
zmagod
4f7d62e79d
removes unneeded annotations [fixes SCI-915]
2017-01-20 11:33:10 +01:00
Matej Zrimšek
5d65627808
Fixed sample editing in samples table. [SCI-914]
2017-01-20 11:10:17 +01:00
Mojca Lorber
3789769af3
add dynamic length for sample type/group field when adding new sample
2017-01-20 09:53:44 +01:00
zmagod
9550c6dd35
fixes highlight.js
2017-01-19 17:09:25 +01:00
Mojca Lorber
6653f0d4c1
small fixes
2017-01-19 16:42:14 +01:00
Mojca Lorber
6de83ff53b
fix hound
2017-01-19 15:58:40 +01:00
Mojca Lorber
4ea154410a
add to fields with rich text formatting
2017-01-19 15:27:24 +01:00
Matej Zrimšek
54f8b01341
Removed smart annotation filter button disabling, when no results are found for that filter (so that 'no result found' displays instead). [SCI-894]
2017-01-19 15:26:28 +01:00
Mojca Lorber
44de927cf4
display smart annotations in reports - without rich text fields
2017-01-19 14:22:54 +01:00
Oleksii Kriuchykhin
890c5e3c3d
Add “no results found” message in smart annotation [SCI-886]
2017-01-19 13:42:58 +01:00
Zmago Devetak
039a8d7da6
Merge pull request #426 from ZmagoD/zd_add_tinyMCE
...
Add tiny mce
2017-01-19 12:57:55 +01:00
zmagod
2cbb8ba41a
removed unneeded comments
2017-01-19 12:54:48 +01:00
mz3944
da604d2619
Merge pull request #427 from mz3944/mz-sci-908
...
Some smart annotations refactoring [SCI-908]
2017-01-19 12:15:20 +01:00
zmagod
f2d5066dc7
fix some bugs
2017-01-19 11:37:59 +01:00
Matej Zrimšek
5d86bbb812
Smart annotations improved documentation. [SCI-908]
2017-01-19 10:56:02 +01:00
Matej Zrimšek
fec83e8c45
Smart annotations refactoring. [SCI-908]
2017-01-19 10:55:43 +01:00
zmagod
2ccafdd670
bug fix
2017-01-19 10:12:01 +01:00
zmagod
27d3868f37
fix bugs
2017-01-19 09:40:39 +01:00
zmagod
88d7cb200e
removed quill
2017-01-18 23:06:14 +01:00
zmagod
65fa631b1c
adding tinyMce first run
2017-01-18 22:40:08 +01:00
okriuchykhin
18d329fb42
Merge pull request #423 from okriuchykhin/ok_SCI_896
...
Make search work for full names in smart annotations [SCI-896]
2017-01-18 17:58:52 +01:00
Oleksii Kriuchykhin
6555fd02b6
Make search work for full names in smart annotations [SCI-896]
2017-01-18 16:57:51 +01:00
okriuchykhin
7f6ceef9e9
Merge pull request #422 from okriuchykhin/ok_SCI_897
...
Remove sample type and group from smart annotation [SCI-897]
2017-01-18 16:26: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
Matej Zrimšek
dbbb709bf2
Smart annotations minor refactoring. [SCI-884, SCI-889]
2017-01-18 16:04:39 +01:00
Matej Zrimšek
24458fe590
Smart annotations filter switching fixed/hacked. [SCI-884, SCI-889]
2017-01-18 15:29:48 +01:00
Oleksii Kriuchykhin
e45749d3b2
Remove sample type and group from smart annotation [SCI-897]
2017-01-18 14:46:53 +01:00
Mojca Lorber
f656a1093d
fix hound
2017-01-18 14:40:24 +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
3b92ab9f36
add names to tables from protocol steps in reports
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
okriuchykhin
8a220c2351
Merge pull request #414 from okriuchykhin/ok_SCI_887
...
Do not show archived projects, experiments and tasks in smart annotations [SCI-887]
2017-01-18 13:50:22 +01:00
Oleksii Kriuchykhin
55d0e82fcd
Change If statement to ternary operator [SCI-887]
2017-01-18 13:43:21 +01:00
Oleksii Kriuchykhin
a490a12fb1
Add truncation of image description in the preview [SCI-873]
2017-01-18 13:28:56 +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
okriuchykhin
9dfa30fbb4
Merge pull request #418 from okriuchykhin/ok_SCI_855_v2
...
Remove previous fix for popups [SCI-855]
2017-01-18 11:00:54 +01:00
Oleksii Kriuchykhin
12eb1df69f
Remove previous fix for popups [SCI-855]
2017-01-18 10:59:00 +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
Matej Zrimšek
3085452ec9
Fixed some hound alerts. [SCI-884]
2017-01-17 11:04:16 +01:00
Matej Zrimšek
d3c33c9dca
Refactored smart annotation JS. [SCI-884]
2017-01-17 10:05:41 +01:00
Luka Murn
ffc2b56dff
Fix String quotes
2017-01-17 08:28:41 +01:00
Luka Murn
2f48409fdd
Merge pull request #409 from Ducz0r/lm-sci-813-fix-v2
...
Fix filter not working correctly with hidden custom columns [SCI-813]
2017-01-17 08:17:52 +01:00
Oleksii Kriuchykhin
0ce71884a5
Add missed space in the string [SCI-888]
2017-01-16 17:09:41 +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
Luka Murn
16955dcee6
Fix Hound errors.
2017-01-16 15:58:37 +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
Matej Zrimšek
2877126dc6
Fixed selected search filter button style. [SCI-884]
2017-01-16 12:52:03 +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
mlorb
88cc87d168
Merge pull request #408 from mlorb/ml-sci-847-v2
...
Adjust columns width in samples table header after selecting sample group [SCI-847]
2017-01-16 10:52:00 +01:00
Luka Murn
a0e9e5afa8
Merge pull request #402 from mz3944/mz-sci-848-v2
...
Unable to delete samples [SCI-848]
2017-01-16 10:47:13 +01:00
Luka Murn
0fd9660eb7
Merge pull request #403 from Ducz0r/lm-sci-876-fix
...
Year difference problems with notifications [SCI-876]
2017-01-14 10:01:38 +01:00
Luka Murn
1acf258c70
Fix minor Zmagohound comment
2017-01-14 10:00:52 +01:00
Mojca Lorber
9f1a49847e
fix table header again
2017-01-13 18:54:43 +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
Luka Murn
ba567284ed
Fix filter not working correctly with hidden custom columns
...
Closes SCI-813.
2017-01-13 17:03:19 +01:00
Mojca Lorber
5f7e0b2227
adjust columns width in samples table header after selecting sample group
2017-01-13 15:59:47 +01:00
okriuchykhin
1ae5e6f8a7
Merge pull request #406 from okriuchykhin/ok_SCI_855
...
Fix compatibility of fixed samples table header and modal-tooltip [SCI-855]
2017-01-13 15:56:37 +01:00
Oleksii Kriuchykhin
a190ef36ff
Extend comment to make more clear [SCI-855]
2017-01-13 12:43:43 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin
097209bd9d
Fix compatibility of fixed samples table header and modal-tooltip [SCI-855]
2017-01-13 11:34:05 +01:00
Mojca Lorber
bc6fbc5f91
fix hound
2017-01-13 11:18:44 +01:00
Mojca Lorber
4250088447
fix broken scrolling functionality in samples table
2017-01-13 11:07:33 +01:00
Oleksii Kriuchykhin
f567d0307e
Fix includes [SCI-102]
2017-01-12 17:02:01 +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
Luka Murn
bc03a26d4b
Also fix this new year issue on comments display
2017-01-12 15:06:12 +01:00
Luka Murn
8b01f912a0
Fix new year problems with activities
...
Closes SCI-876.
2017-01-12 14:47:15 +01:00
Matej Zrimšek
93a8e0bdae
Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848]
2017-01-12 14:08:29 +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
d05c16b0ba
Added auto_link wrapper with custom sanitization [SCI-102]
2017-01-11 17:02:17 +01:00
mz3944
aba12b9b2c
Merge pull request #401 from mz3944/mz-sci-878
...
Protocol repository - user cannot download files
2017-01-11 16:25:45 +01:00
Oleksii Kriuchykhin
0546716a0b
Improve user input sanitization, fix bugs [SCI-102]
2017-01-11 15:50:11 +01:00
okriuchykhin
404952336d
Merge pull request #400 from okriuchykhin/ok_SCI_846
...
Fixes sorting of custom columns in samples datatable [SCI-846]
2017-01-11 15:34:02 +01:00
mlorb
fe1ef97523
Merge pull request #398 from mlorb/ml_sci_843
...
Adjust samples tables height when in edit mode selecting sample type/group [SCI-843]
2017-01-11 15:33:52 +01:00
Mojca Lorber
3a3f20a215
fix bug with different approach
2017-01-11 15:25:10 +01:00
zmagod
065e1a7120
fix hound
2017-01-11 15:06:00 +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
Matej Zrimšek
30a9c283fb
Added back bullets to images in protocol preview in protocol repository.
2017-01-11 14:15:07 +01:00
Matej Zrimšek
852dc2eb7e
Added file downloading to protocol preview in protocol repository. [SCI-878]
2017-01-11 14:14:12 +01:00
Oleksii Kriuchykhin
094d0f0f71
Fixes sorting of custom columns in samples datatable [SCI-846]
2017-01-11 13:21:38 +01:00
okriuchykhin
8d4b2d7373
Merge pull request #399 from okriuchykhin/ok_SCI_811_v2
...
Fix changed sample type and sample group in sample edit [SCI-811]
2017-01-11 11:37:38 +01:00
mlorb
90e644ddd9
Merge branch 'master' into ml_sci_843
2017-01-11 11:35:41 +01:00
mlorb
f0842389b2
Merge pull request #396 from mlorb/ml_sci_851
...
Change color of clickable names when row is selected in datatables [SCI-851]
2017-01-11 11:21:31 +01:00
mlorb
b898c792c4
Merge pull request #395 from mlorb/ml_sci_847
...
Adjust columns width in table header after selecting sample type/group [SCI-847]
2017-01-11 10:43:12 +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
Oleksii Kriuchykhin
a3d9e25feb
Fix changed sample type and sample group in sample edit [SCI-811]
2017-01-10 16:51:51 +01:00
Mojca Lorber
577e526fec
adjust samples tables height when in edit mode selecting sample type or group
2017-01-10 16:31:20 +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
e0e998a0d8
add smart annotation parser helper
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
Luka Murn
0cf5afa499
Merge pull request #376 from Ducz0r/lm-sci-813-fix
...
Fix search on hidden columns in samples table [SCI-813]
2017-01-10 11:27:56 +01:00
Luka Murn
05be1e862f
Update filter after toggling visibility (if neccesary)
2017-01-10 11:26:12 +01:00
okriuchykhin
f8237e025a
Merge pull request #394 from okriuchykhin/ok_SCI_853
...
Fix non removable error messages in samples [SCI-853]
2017-01-10 11:00:01 +01:00
Luka Murn
5873eea994
We serve to please the Hound
2017-01-10 10:42:52 +01:00
Oleksii Kriuchykhin
4c9c9037ed
Enable image preview after editing protocol and disable preview modal animation [SCI-868]
2017-01-09 17:19:46 +01:00
Mojca Lorber
510731bd4e
change color of clickable nameswhen row is selected in datatables
2017-01-09 15:51:21 +01:00
Mojca Lorber
a0a7f35d44
adjust columns width in table header after selecting sample type/group
2017-01-09 15:00:07 +01:00
Oleksii Kriuchykhin
773b00933a
Improve multiple messages handling in samples [SCI-853]
2017-01-09 13:55:50 +01:00
Oleksii Kriuchykhin
0fd7688427
Fix hiding of error messages in the samples datatable [SCI-853]
2017-01-09 13:34:23 +01:00
okriuchykhin
3f930ccfce
Merge pull request #392 from okriuchykhin/ok_SCI_858
...
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
2017-01-09 12:49:38 +01:00
mz3944
54ef2be94b
Merge pull request #383 from mz3944/mz-sci-845
...
Fixed samples table all rows un/checking. [SCI-845]
2017-01-09 11:58:44 +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
okriuchykhin
3c47d17019
Merge pull request #386 from okriuchykhin/ok_SCI_815
...
Improve error message when importing CSV files with incorrect character encoding [SCI-815]
2017-01-09 11:54:28 +01:00
zmagod
226d5d8247
added blank string to wopi-lock header param
2017-01-09 11:51:18 +01:00
mlorb
006db01b11
Merge pull request #390 from mlorb/ml_sci_850
...
Fix samples info popup error [SCI-850]
2017-01-09 11:38:50 +01:00
mlorb
f14ad0f762
Merge pull request #387 from mlorb/ml_sci_732
...
Add protocol preview to search results [SCI-732]
2017-01-09 11:28:04 +01:00
Oleksii Kriuchykhin
bc8db28746
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
2017-01-09 09:38:42 +01:00
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
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
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
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
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
Oleksii Kriuchykhin
c77c83752e
Remove unused css class link-look [SCI-819]
2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin
0d01a4b2bd
Remove unneeded function from utils.js [SCI-819]
2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin
4065be9e4e
Fix marking of selected option [SCI-819]
2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin
e22ff6f8bb
Fix an issue with sample editing and type/group dropdowns [SCI-819]
2016-12-30 15:50:43 +01:00
okriuchykhin
2474eac37d
Merge pull request #367 from okriuchykhin/ok_SCI_818
...
Fix sample info popup [SCI-818]
2016-12-30 15:43:28 +01:00
okriuchykhin
e826791429
Merge pull request #365 from okriuchykhin/ok_SCI_807
...
Fix buttons disappear when deleting columns in samples [SCI-807]
2016-12-30 15:43:13 +01:00
okriuchykhin
68ac3486c7
Merge pull request #381 from okriuchykhin/ok_SCI_275
...
Add task name to project activity [SCI-275]
2016-12-30 15:32:08 +01:00
okriuchykhin
73478d7b5e
Merge pull request #372 from okriuchykhin/ok_SCI_816
...
Fix flash message display in samples table [SCI-816]
2016-12-30 15:30:14 +01:00
okriuchykhin
cce57d066c
Merge pull request #370 from okriuchykhin/ok_SCI_817
...
Fix issue with long samples column names in import modal [SCI-817]
2016-12-30 15:29:32 +01:00
okriuchykhin
e8955b0304
Merge pull request #375 from okriuchykhin/ok_SCI_361
...
Add sorting to Project's experiments overview [SCI-361]
2016-12-30 15:28:53 +01:00
Oleksii Kriuchykhin
f076226b3f
Add task name to project activity [SCI-275]
2016-12-29 16:31:48 +01:00
Oleksii Kriuchykhin
d798f1b120
Fix XSS vulnerability in protocol keywords [SCI-632]
2016-12-29 15:15:29 +01:00
Oleksii Kriuchykhin
e156dbc987
Implement flash message hiding through module pattern [SCI-816]
2016-12-28 14:52:03 +01:00
Luka Murn
2304742d87
Add tooltips to samples column dropdown
...
Closes SCI-802.
2016-12-27 08:45:23 +01:00
Luka Murn
b931b20f02
Fix 2 bugs with comments editing
...
Closes SCI-820.
2016-12-23 20:41:23 +01:00
Luka Murn
fbc2be890c
Fix search on hidden columns in samples table
...
Closes SCI-813.
2016-12-23 19:56:54 +01:00
Oleksii Kriuchykhin
4d3e002c81
Add sorting to Project's experiments overview [SCI-361]
2016-12-23 15:40:01 +01:00
Luka Murn
4b50c73474
Merge pull request #363 from Ducz0r/lm-sci-546-fix
...
Restyle step table display in reports [SCI-546]
2016-12-23 12:57:54 +01:00
Luka Murn
87d8fece46
Fix bug on edit/cancel sample group page
...
Closes SCI-814.
2016-12-23 12:50:49 +01:00
mlorb
876ce37a96
Merge pull request #366 from mlorb/ml-sci-284
...
Samples - freeze header row and edit button... [SCI-284]
2016-12-23 12:29:41 +01:00
Luka Murn
3922be2b17
Change String in sample types & groups
...
Closes SCI-808.
2016-12-23 11:48:57 +01:00
Mojca Lorber
40e3240a99
add content to preview modal
2016-12-22 11:43:11 +01:00
Luka Murn
5beaa26224
Update utils.js
...
Closes SCI-811.
2016-12-22 10:03:00 +01:00
Oleksii Kriuchykhin
ee5e0ad455
Fix flash message display in samples table [SCI-816]
2016-12-21 17:26:33 +01:00
zmagod
e554fdf805
code refactor
2016-12-21 16:52:15 +01:00
Luka Murn
af6bf2aee1
Fix jQuery selector, make it work for new samples
2016-12-21 16:23:09 +01:00
zmagod
01849a46db
removed unneeded lines
2016-12-21 15:40:07 +01:00
zmagod
a5a8bbf27a
fixed assigned column bug
2016-12-21 15:35:05 +01:00
Oleksii Kriuchykhin
53ea09c3de
Fix issue with long samples column names in import modal [SCI-817]
2016-12-21 14:34:53 +01:00
zmagod
e2723a288c
fixes bug with samples sorting [fixes SCI-812]
2016-12-21 14:32:28 +01:00
Luka Murn
e52277bdad
Fix sample types & groups when editing sample in samples table
...
Closes SCI-811.
2016-12-21 13:15:55 +01:00
Oleksii Kriuchykhin
034976a709
Fix sample info popup [SCI-818]
2016-12-20 17:21:17 +01:00
Oleksii Kriuchykhin
00ea3a027c
Fix generation of preview url for new steps and results [SCI-694]
2016-12-20 16:10:53 +01:00
Oleksii Kriuchykhin
cbef971d85
Fix timeouts when fetching images from S3 [SCI-694]
2016-12-20 15:36:07 +01:00
Mojca Lorber
ba0214d1ff
staying on same page after saving a sample; fix button disappearance when adding new column
2016-12-20 15:19:31 +01:00
Mojca Lorber
165ec6144c
adjust columns width in table header when editing or adding new sample; and fix horizontal scrolling
2016-12-20 13:41:19 +01:00
Oleksii Kriuchykhin
42f71f4da8
Fix buttons disappear when deleting columns in samples datatable [SCI-807]
2016-12-20 09:49:21 +01:00
Oleksii Kriuchykhin
d2b76d8385
Improved image preview modal [SCI-694]
2016-12-19 17:36:18 +01:00
Mojca Lorber
d1e2354f4e
add scrolling functionality and remove bug with adding new column
2016-12-19 16:59:09 +01:00
zmagod
6f7f6a8b7f
removes dropdown sorting [fixes SCI-811]
2016-12-19 16:41:14 +01:00
Luka Murn
a48eaf662e
Restyle step table display in reports so
...
Closes SCI-546.
2016-12-19 15:09:49 +01:00
zmagod
efe41817f2
removes sample group/type link in new sample form [fixes SCI-809]
2016-12-19 10:49:21 +01:00
Oleksii Kriuchykhin
b537feb8a0
Added large preview [SCI-694]
2016-12-16 17:07:08 +01:00
Oleksii Kriuchykhin
8738b3e09d
Added image preview to Results [SCI-694]
2016-12-16 15:55:46 +01:00
Oleksii Kriuchykhin
0541253ffa
Added modal for images preview [SCI-694]
2016-12-16 15:53:16 +01:00
Zmago Devetak
90a115fff3
Merge pull request #342 from ZmagoD/zd_SCI_758
...
Generate png preview images for uploaded TIFF images
2016-12-16 15:39:07 +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
Zmago Devetak
c9d38a5454
Merge pull request #359 from ZmagoD/zd_SCI_804
...
disables sorting and columns dropdown when editing or adding new samp…
2016-12-16 12:56:11 +01:00
Zmago Devetak
601594fdb9
Merge pull request #355 from ZmagoD/zd_fix_mozilla_compatibility_issue
...
fixes compatibility issue on mozilla firefox
2016-12-16 11:57:18 +01:00
Zmago Devetak
b35744d18e
Merge pull request #360 from ZmagoD/zd_update_gemfile
...
updated gemfile
2016-12-16 11:53:05 +01:00
zmagod
897e34a23b
reinitialize highlight.js after ajax call
2016-12-16 11:44:42 +01:00
zmagod
b87246c8c2
cleanup spinner after edit step
2016-12-16 11:10:03 +01:00
Zmago Devetak
ad9b25ba44
Merge pull request #356 from ZmagoD/zd_SCI_803
...
fixes bug with long column names in edit mode [fixes SCI-803]
2016-12-16 11:02:42 +01:00
Zmago Devetak
3d500800cd
Merge pull request #358 from ZmagoD/zd_SCI_805_801
...
removes error message from new type/group form [fixes SCI-805]
2016-12-16 10:54:23 +01:00
zmagod
25671c744a
disables sorting and columns dropdown when editing or adding new sampe [fixes SCI-804]
2016-12-16 09:50:45 +01:00
zmagod
fffa0d91da
removes error message from new type/group form [fixes SCI-805]
2016-12-15 16:17:34 +01:00
zmagod
7c88f3e0aa
fixed empty name error
2016-12-15 15:50:07 +01:00
zmagod
6755ebcbf8
fixes bug with long column names in edit mode [fixes SCI-803]
2016-12-15 15:26:51 +01:00
Zmago Devetak
daee14bed5
Merge pull request #343 from ZmagoD/zd_SCI_780
...
fixed step description links [fixes SCI-780]
2016-12-15 13:12:25 +01:00
zmagod
dc6e9dcbd8
fixes compatibility issue on mozilla firefox
2016-12-15 11:57:17 +01:00
Mojca Lorber
69d164da68
add new column on first position
2016-12-15 11:20:40 +01:00
zmagod
9083f84396
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_789
2016-12-15 11:03:19 +01:00
zmagod
3e31f114d4
app/assets/javascripts/samples/sample_datatable.js
2016-12-15 10:51:17 +01:00
zmagod
b164886270
fixed error mesage scroll
2016-12-15 10:44:23 +01:00
zmagod
b003d192c3
fixed edit mode
2016-12-15 09:54:38 +01:00
zmagod
ba58ac2a77
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_781_796
2016-12-15 09:26:12 +01:00
zmagod
54fee339f8
cleanup unneeded code
2016-12-15 09:23:38 +01:00
zmagod
4d6a85ed7c
fixed sample groups colorpicker [fixes SCI-781]
2016-12-15 09:23:38 +01:00
zmagod
b07f9fae59
fixes new sample group/type link in sample row [fixes SCI-796]
2016-12-15 09:23:38 +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
dfd472d37d
fixed column name after edit
2016-12-14 16:47:39 +01:00
zmagod
a9f8239516
fixed edit action
2016-12-14 16:37:44 +01:00
okriuchykhin
c4ff12be51
Merge pull request #349 from okriuchykhin/ok_SCI_783
...
Fix columns ordering when deleting custom fields [SCI-783]
2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin
de8eed0a19
Fix hound warning [SCI-783]
2016-12-14 15:27:24 +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
50c9dd3f59
fixed typo
2016-12-14 14:40:56 +01:00
okriuchykhin
2fd7536039
Merge pull request #352 from okriuchykhin/ok_SCI_793
...
Hide dropdown when user interacts with samples table [SCI-793]
2016-12-14 14:19:38 +01:00
okriuchykhin
6381166eb1
Merge pull request #346 from okriuchykhin/ok_SCI_788
...
Preserve scroll position in the samples columns dropdown when reordering [SCI-788]
2016-12-14 14:19:15 +01:00
Zmago Devetak
ef4ae1abcb
Merge pull request #348 from ZmagoD/zd_SCI_785
...
fixes samples table dropdown edit mode [fixes SCI-785]
2016-12-14 13:37:09 +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
Oleksii Kriuchykhin
9f439cf183
Hide dropdown when user interacts with samples table [SCI-793]
2016-12-13 17:25:01 +01:00
zmagod
d9971b4502
adds error message in samples table dropdown [fixes SCI-789]
2016-12-13 17:08:19 +01:00
Oleksii Kriuchykhin
e414af2fc3
Fix columns ordering when deleting custom fields [SCI-783]
2016-12-13 16:21:17 +01:00
zmagod
fa19bf1de7
fixes samples table dropdown edit mode [fixes SCI-785]
2016-12-13 15:43:31 +01:00
zmagod
2426539715
fixes long names in columns dropdown [fixes SCI-784]
2016-12-13 14:54:37 +01:00
zmagod
c960230bf0
fixes dropdown height bug [fixes SCI-787]
2016-12-13 11:35:50 +01:00
Oleksii Kriuchykhin
de12fac767
Preserve scroll position in the samples coluns dropdown when reordering [SCI_788]
2016-12-13 11:25:35 +01:00
zmagod
3c1a275510
fixes invited user samples table [fixes SCI-790]
2016-12-13 10:56:13 +01:00
Mojca Lorber
2cfcba0ceb
add protocol preview modal
2016-12-13 10:39:18 +01:00
Zmago Devetak
d54007f69c
Merge pull request #337 from ZmagoD/zd_SCI_740
...
limits max size of all uploaded files at the one time
2016-12-13 09:04:14 +01:00
zmagod
b56913cc87
refactor
2016-12-12 16:21:38 +01:00
zmagod
4b0e2baa3f
fixes breadcrumbs in secondary nav
2016-12-12 16:03:14 +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
5176f8b459
clean unneeded code [fixes SCI-778] refactor js
2016-12-12 15:40:13 +01:00
zmagod
d9025a9601
changes create/edit mode buttons [fixes SCI-777]
2016-12-12 14:42:06 +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
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
okriuchykhin
420daf3a6a
Merge pull request #344 from okriuchykhin/ok_SCI_779
...
Fix adding new samples columns [SCI-779]
2016-12-12 09:29:27 +01:00
Oleksii Kriuchykhin
435a8d20bb
Fix columns visability and reordering bug [SCI-779]
2016-12-09 17:37:22 +01:00
Matej Zrimšek
54de13de82
Upon redirection when clicking the new sample type or group link, you're automatically in adding mode. [Fixes SCI-701]
2016-12-09 17:22:09 +01:00
Matej Zrimšek
0b12c87b09
Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701]
2016-12-09 16:44:50 +01:00
Oleksii Kriuchykhin
460ca067a2
Fix adding new samples columns [SCI-779]
2016-12-09 16:07:41 +01:00
zmagod
e23be6cc0e
fixed step description links [fixes SCI-780]
2016-12-09 15:26:41 +01:00
Oleksii Kriuchykhin
274fd63a41
Initial code commit [SCI-779]
2016-12-09 15:21:26 +01:00
zmagod
8b0dab624d
clear unneeded css, change processing image [fixes SCI-758]
2016-12-09 14:24:20 +01:00