zmagod
75507107fd
migrate to 4.2.9
2017-06-23 08:50:12 +02:00
Zmago Devetak
f9e04e80b4
Merge pull request #705 from ZmagoD/zd_SCI_1393
...
removes imported repository row if the row value is not valid [fixes …
2017-06-22 17:50:02 +02:00
Zmago Devetak
cffac82e88
Merge pull request #704 from ZmagoD/zd_SCI_1392
...
fixes bug with long text in parse records modal [fixes SCI-1392]
2017-06-22 17:47:15 +02:00
Zmago Devetak
514c6c0d53
Merge pull request #706 from ZmagoD/zd_SCI_1385
...
fixes row dupplication [fixes SCI-1385]
2017-06-22 17:47:00 +02:00
zmagod
7367435c6d
refactor
2017-06-22 17:32:12 +02:00
zmagod
2dd9b6ff19
fix update repository_row
2017-06-22 17:29:17 +02:00
zmagod
590135b9b3
refactor
2017-06-22 17:26:11 +02:00
zmagod
1690d8ebe3
removed reload on hide modal
2017-06-22 16:47:50 +02:00
zmagod
2b2f513366
fixes export pdf error on production
2017-06-22 16:40:50 +02:00
zmagod
e7328c2e20
fixes row dupplication [fixes SCI-1385]
2017-06-22 16:01:37 +02:00
zmagod
703be13fb0
removes imported repository row if the row value is not valid [fixes SCI-1393]
2017-06-22 15:21:36 +02:00
zmagod
a2e1aa5b36
fixes bug with long text in parse records modal [fixes SCI-1392]
2017-06-22 14:43:01 +02:00
Mojca Lorber
1ba32e19cb
allign no. of pages and showing entries per page
2017-06-22 14:23:03 +02:00
zmagod
28129ebb73
refactor
2017-06-21 17:39:20 +02:00
zmagod
bad52ceff1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
2017-06-21 15:56:07 +02:00
zmagod
18fd5b00ba
fix hound
2017-06-21 15:01:55 +02:00
zmagod
f66fb49b56
adds import records to repositories [fixes SCI-1336]
2017-06-21 14:45:50 +02:00
mz3944
568e41f5fa
Merge pull request #701 from mz3944/mz-SCI-1383
...
Removed empty first column of repository export file [SCI-1383]
2017-06-21 10:57:46 +02:00
Matej Zrimšek
d907819de5
Removed byebug calls. [SCI-1383]
2017-06-21 10:49:00 +02:00
mz3944
d19bfc8fd8
Merge pull request #700 from mz3944/mz-SCI-1386
...
Fixed tooltip not showing on mouse over truncated cell text [SCI-1386]
2017-06-21 10:40:37 +02:00
mz3944
2ad27289c9
Merge pull request #699 from mz3944/mz-SCI-1378
...
Change repository icon on reports [SCI-1378]
2017-06-21 10:40:16 +02:00
mz3944
4d5136270a
Merge pull request #698 from mz3944/mz-SCI-1384
...
Fixed AJAX error when deleting custom columns in repository table [SCI-1384]
2017-06-21 10:39:53 +02:00
zmagod
f64e1ac713
fix locales
2017-06-21 09:31:39 +02:00
Matej Zrimšek
47407ef40c
Removed empty first column of repository export file. [SCI-1383]
2017-06-20 18:40:41 +02:00
Matej Zrimšek
ce97d18e78
Fixed tooltip not showing on mouse over truncated cell text. [SCI-1386]
2017-06-20 17:51:51 +02:00
Matej Zrimšek
d49524a26f
Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378]
2017-06-20 16:10:50 +02:00
Oleksii Kriuchykhin
115ce91d8d
Handle column mappings in task repository [SCI-1381]
2017-06-20 15:58:52 +02:00
Matej Zrimšek
6c7987681c
Updating repository table state of every user belonging to the team of the repository, when custom column is removed or added. [SCI-1384]
2017-06-20 14:52:41 +02:00
Oleksii Kriuchykhin
9a9f8b9c41
Fix total number of records in task repository [SCI-1381]
2017-06-19 16:45:57 +02:00
mlorb
14429a270c
Merge pull request #689 from mlorb/ml_sci_1354
...
Truncate and display text in tooltip in custom repository fields [SCI-1354]
2017-06-19 15:50:38 +02:00
Mojca Lorber
730c4738d5
fix tooltip in edit mode
2017-06-19 15:49:31 +02:00
Mojca Lorber
39dd6daabb
small fixes
2017-06-19 15:30:38 +02:00
mlorb
122ac7971f
Merge pull request #692 from mlorb/ml_sci_1348
...
Fix cog position on repositories page [SCI-1348]
2017-06-19 15:16:01 +02:00
mlorb
9a7669bf2a
remove empty line
2017-06-19 15:15:27 +02:00
mlorb
ff02c45f5f
Merge pull request #695 from mlorb/ml_sci_1353
...
Retain the same word case in repositories dropdown [SCI-1353]
2017-06-19 14:48:58 +02:00
mlorb
733f6267db
Merge pull request #696 from mlorb/ml_sci_1380
...
Fix ordering of repositories on task [SCI-1380]
2017-06-19 14:28:00 +02:00
mlorb
7cbc8a2f95
Merge pull request #694 from mlorb/ml_sci_1347
...
Fix flash when deleting samples of other users [SCI-1347]
2017-06-19 14:19:57 +02:00
mlorb
beaba6a92b
Merge pull request #693 from mlorb/ml_sci_1351_v3
...
Fix error msg when editing empty cell in repositories [SCI-1351]
2017-06-19 14:19:27 +02:00
zmagod
70fa681519
split the import service
2017-06-19 14:05:37 +02:00
Mojca Lorber
4c3036af87
fix ordering of repositoris on task
2017-06-19 10:53:18 +02:00
Mojca Lorber
f77b1aa4e8
retain the same word case in repositories dropdown
2017-06-19 10:32:12 +02:00
Mojca Lorber
9b941fe374
fix flash when deleting samples of other users
2017-06-16 17:12:04 +02:00
mz3944
e027a871e9
Merge pull request #691 from mz3944/mz-SCI-1357-v2
...
Repository management - filter on custom columns [SCI-1357]
2017-06-16 16:04:47 +02:00
Matej Zrimšek
6b284d8c89
Filtering and sorting of records didn't work when sorting on custom columns in repository datatable. [SCI-1357]
2017-06-16 16:02:31 +02:00
mlorb
49ce08f1f5
Merge pull request #688 from mlorb/ml_sci_1375
...
Fix no repository name in activity bug [SCI-1375]
2017-06-16 15:13:42 +02:00
Mojca Lorber
1b683bc70e
fix error msg when editing empty cell in repositories
2017-06-16 15:09:04 +02:00
Matej Zrimšek
1f0eeeaecb
Optimized repository cells search by replacing Rails select statement with raw SQL statement. [SCI-1357]
2017-06-16 14:31:31 +02:00
okriuchykhin
05ea00a5d3
Merge pull request #690 from okriuchykhin/ok_SCI_1346_v2
...
Fix bug when reordering column to the first position in repositories [SCI-1346]
2017-06-16 14:29:08 +02:00
Mojca Lorber
b6f146f177
fix cog position on repositories page
2017-06-16 11:54:31 +02:00
Oleksii Kriuchykhin
94d74b8101
Make assigned column always visible in repositories [SCI-1346]
2017-06-16 11:47:41 +02:00
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
zmagod
de3099e4d1
removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository
2016-12-09 13:59:49 +01:00
Luka Murn
8a55ef29e4
Remove unused code
...
Closes SCI-711.
2016-12-09 13:49:19 +01:00
Luka Murn
1a8b141b95
Add delete custom field functionality
2016-12-09 13:49:19 +01:00
Luka Murn
7e32c13d27
Fix edit & delete functionality so it works with draggable
2016-12-09 13:18:59 +01:00
Luka Murn
754c90b612
Edit functionality now works
2016-12-09 13:18:59 +01:00
Luka Murn
54ebdbb06c
Update edit mode JS & CSS
2016-12-09 13:18:59 +01:00
Luka Murn
da630ac2cb
Make edit, delete buttons clickable & hide them if neccesary
2016-12-09 13:18:59 +01:00
Matej Zrimšek
aea679ec11
Added links for creating new sample type and group when creating new sample. [fixes SCI-701]
2016-12-09 11:39:12 +01:00
Mojca Lorber
0e3526c9ad
Merge branch 'mlorb-ml-sci-696' into improved-sample-table
...
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
2016-12-08 15:44:50 +01:00
Mojca Lorber
1b2a438ed4
remove fixed columns
2016-12-08 15:24:54 +01:00
zmagod
40fdfef67f
setup delayed_paperclip gem
2016-12-08 15:24:14 +01:00
Mojca Lorber
7d88e247fc
refactoring
2016-12-08 14:41:35 +01:00
zmagod
ac52e643be
cleanup direct upload
2016-12-08 11:26:13 +01:00
Nbernot
1eb3ddee53
Token expiration restored to 1 day.
2016-12-08 11:12:24 +01:00
Mojca Lorber
227fe9c284
change to after_create
2016-12-07 17:43:00 +01:00
Mojca Lorber
87dc76f4e3
change to update samples table state after initialize
2016-12-07 17:25:42 +01:00
Mojca Lorber
114a17ff0f
change to create
2016-12-07 16:57:17 +01:00
Mojca Lorber
228990f9da
fix samples table state, when adding new custom column
2016-12-07 16:37:16 +01:00
Mojca Lorber
5b5342de6f
make first column fixed
2016-12-07 15:02:18 +01:00
Mojca Lorber
195055f9cf
change SAMPLES_TABLE_DEFAULT_STATE
2016-12-07 14:51:34 +01:00
Mojca Lorber
39b6fa66fe
add SamplesTable for new users
2016-12-07 14:14:32 +01:00
zmagod
9f1e436623
limits max size of all uploaded files at the one time [fixes SCI-740]
2016-12-07 09:02:04 +01:00
Luka Murn
62353b6c3b
Temporary change token expiration
2016-12-06 16:33:32 +01:00
Zmago Devetak
310b61ec12
Merge pull request #335 from ZmagoD/zd_SCI_752
...
fixes inport eln error message and spinner [fixes SCI-752]
2016-12-06 15:11:34 +01:00
okriuchykhin
cb2abfa7a9
Merge pull request #325 from okriuchykhin/ok_SCI_712
...
Added form for adding new columns to samples table into dropdown [SCI-712]
2016-12-06 15:00:01 +01:00
Zmago Devetak
49f9e64171
Merge pull request #333 from ZmagoD/zd_SCI_700
...
Managing sample groups tab
2016-12-06 14:51:09 +01:00
zmagod
dd85b128d2
fixed glyphicon-ok position
2016-12-06 14:47:16 +01:00
zmagod
8ca7151df4
added constant to load_from_file_size_error local
2016-12-06 13:52:07 +01:00
Oleksii Kriuchykhin
e02d780e44
Added Enter key handling and fixed error reporting [SCI-712]
2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
da7e86c7c2
Fix save/delete buttons after updating datatable and added permissions check [SCI-712]
2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
f6dd64772a
Add columns to samples table without page reload [SCI-712]
2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
40db8310fd
Move code to sample_datatable.js and removed unused modal [SCI-712]
2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
22dabd2177
Added form for adding new columns to samples table into dropdown [SCI-712]
2016-12-06 13:17:05 +01:00
Oleksii Kriuchykhin
94866e8994
Initial code commit for samples columns dropdown [SCI-712]
2016-12-06 13:16:05 +01:00
Mojca Lorber
1bc0ca9e75
fix bug with first time load
2016-12-06 13:14:29 +01:00
zmagod
787b8b1600
fixed new sample type/group form
2016-12-06 12:01:02 +01:00
Mojca Lorber
12088ebfd3
add visibility functionality after refresh
2016-12-06 09:40:28 +01:00
Mojca Lorber
849f78b4df
implement reordering of columns in the samples table and change from local to database storage
2016-12-05 11:34:36 +01:00
Mojca Lorber
01e75fbbcc
create samples table model and migration
2016-12-05 11:08:33 +01:00
Zmago Devetak
a376118cd8
Merge pull request #334 from ZmagoD/zd_SCI_746
...
fixes bug with deleted team name
2016-12-05 10:47:39 +01:00
Zmago Devetak
91f29745c4
Merge pull request #314 from ZmagoD/zd_SCI_643
...
adds autolink
2016-12-05 10:47:23 +01:00
zmagod
ef2471d3f7
fixes inport eln error message and spinner [fixes SCI-752]
2016-12-05 10:44:58 +01:00
zmagod
6274cd413e
fixes bug with deleted team name [fixes SCI-746]
2016-12-02 16:07:00 +01:00
zmagod
7725374c42
refactor sample types/groups [fixes SCI-700]
2016-12-02 09:58:35 +01:00
zmagod
83aae59eed
adds sample groups index page
2016-12-02 09:33:09 +01:00
Luka Murn
372b455d7d
Merge pull request #332 from Ducz0r/lm-sci-750-751
...
Fix inviting users not working
2016-12-01 15:52:40 +01:00
Luka Murn
6a770f6a7e
Fix inviting users not working
...
Closes SCI-750, SCI-751.
Probably reopens parts of SCI-746.
2016-12-01 15:46:37 +01:00
Matej Zrimšek
3bdaa4bcef
Some token authentication refactoring and error handilng fixes. [closes SCI-689]
2016-12-01 15:38:56 +01:00
Nejc Bernot
ef60982913
Subdomain checks fixed
2016-12-01 14:20:43 +01:00
Nejc Bernot
c54bd6df82
Added user ids to wopi tokens
2016-12-01 13:48:11 +01:00
Matej Zrimšek
46465060d0
Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689]
2016-11-30 16:56:56 +01:00
Nejc Bernot
cb03ed8384
Users can now have multiple tokens
...
A new token is generated whenever an edit or view file is called. Tokens have a TTL of one day.
Also enabled the toggling of both wopi and wopi test mode, using environmental variables.
2016-11-30 16:48:42 +01:00
Nejc Bernot
495c648f41
Added subdomain based routing constraints
...
Non-wopi routes will only work with the subdomain set by the env variable USER_SUBDOMAIN (if it is set). Likewise, wopi routes will only work with the WOPI_SUBDOMAIN if it is set, but they also require the WOPI_ENABLED to be true.
2016-11-30 16:43:33 +01:00
Zmago Devetak
33adb58950
Merge pull request #328 from ZmagoD/zd_SCI_699
...
Managing sample types tab
2016-11-30 16:14:13 +01:00
Oleksii Kriuchykhin
2a27c8e6b3
Fix hound warning [SCI-695]
2016-11-30 11:52:07 +01:00
Oleksii Kriuchykhin
f51f33ec25
Added sorting functionality to samples colunmns dropdown [SCI-695]
2016-11-30 11:42:05 +01:00
Luka Murn
680f443e31
Merge pull request #323 from Ducz0r/lm-sci-733-fix
...
Fix task comments not properly showing in reports
2016-11-30 09:51:59 +01:00
Luka Murn
c0a03d9f2d
Merge pull request #322 from Ducz0r/lm-add-show-version-var
...
Add an environmental variable to toggle version display in navbar
2016-11-30 09:49:40 +01:00
Luka Murn
84d0cf4620
Use rails helpers as per @ZmagoD's request
2016-11-30 09:48:57 +01:00
Luka Murn
76ec77fce4
Merge pull request #329 from biosistemika/simplify-signup
...
Merge simplify-signup into master
2016-11-30 09:41:20 +01:00
Luka Murn
d685ac939b
Merge pull request #326 from Ducz0r/lm-sci-746-fix
...
Fix some recaptcha form submit errors for signup pages
2016-11-30 09:35:16 +01:00
zmagod
a2e13441e5
removes create_sample_type modal and related js actions
2016-11-30 09:02:34 +01:00
zmagod
4e4a48620c
adds validation to input fields
2016-11-29 18:08:29 +01:00
zmagod
12848f15fa
adds sample_type index view with all crud actions
2016-11-29 17:15:54 +01:00
Luka Murn
6491cf1806
Refactor & fix sign up constraints
2016-11-29 16:53:40 +01:00
Luka Murn
e099a279b1
Remove link to "Resend confirmation instructions" if not neccesary
...
Closes SCI-747.
2016-11-29 16:12:35 +01:00
Luka Murn
b5d0a39827
Fix some recaptcha form submit errors for signup pages
...
Closes SCI-746.
2016-11-29 15:53:58 +01:00
zmagod
5c0b2d7b24
init sample_types page
2016-11-29 08:57:12 +01:00
Luka Murn
90816ae1fa
Just pleasing the Hound
2016-11-28 17:16:39 +01:00
Luka Murn
073f30dcc5
Fix task comments not properly showing in reports
...
Closes SCI-733.
2016-11-28 17:14:27 +01:00
Zmago Devetak
1e870a6e7c
Merge pull request #320 from ZmagoD/zd_SCI_698
...
adds new samples columns dropdown [fixes SCI-698]
2016-11-28 16:30:16 +01:00
zmagod
72d1dfb15e
cleanup sample_datatable.js
2016-11-28 16:28:22 +01:00
okriuchykhin
f9c8223fe5
Merge pull request #321 from okriuchykhin/ok_SCI_736
...
Improve regexp for image whitelisting [SCI-736]
2016-11-28 15:46:54 +01:00
Oleksii Kriuchykhin
d8f8e01a46
Code cleanup, added new image types to whitelist [SCI-736]
2016-11-28 11:13:20 +01:00
Luka Murn
9f998d6fed
Add an environmental variable to toggle version display in navbar
...
The variable is called NAVBAR_SHOW_VERSION. If not specified,
it defaults to the current behavior (version is hidden on
production, but visible on development & test environments).
2016-11-28 10:52:17 +01:00
Luka Murn
d142fa96d9
Merge pull request #317 from Ducz0r/lm-sci-735-fix
...
Add Deface hooks to sign up & confirm invitation forms
2016-11-28 10:22:46 +01:00
Oleksii Kriuchykhin
cc0aab2e59
Improve regexp for image whitelisting [SCI-736]
2016-11-28 10:08:54 +01:00
okriuchykhin
31f6379866
Merge pull request #318 from okriuchykhin/ok_SCI_736
...
Add whitelisting of supported image types [SCI-736]
2016-11-28 09:32:49 +01:00
zmagod
9d91d2ce28
adds new samples columns dropdown [fixes SCI-698]
2016-11-25 17:29:30 +01:00
okriuchykhin
5981d1a48e
Merge pull request #316 from okriuchykhin/ok_SCI_738
...
Add full name field to accept invitation form [SCI-738]
2016-11-25 16:15:23 +01:00
Luka Murn
7658ae264a
Add uniqueness to sample_type & sample_group name
...
Closes SCI-720.
2016-11-25 16:15:05 +01:00
Oleksii Kriuchykhin
74f6455a8f
Add whitelisting of supported image types [SCI-736]
2016-11-25 16:12:43 +01:00
Luka Murn
a16bbe8fd2
Typo fix
2016-11-25 11:52:33 +01:00
Luka Murn
cb16ab3c75
Add Deface hooks to signup & confirm invitation forms
2016-11-25 11:50:20 +01:00
Oleksii Kriuchykhin
3fdb20b92c
Add full name field to accept invitation form [SCI-738]
2016-11-25 11:15:10 +01:00
Luka Murn
b1b095910c
Merge pull request #309 from Ducz0r/lm-remove-unused-files
...
Brace for impact...
2016-11-25 10:00:29 +01:00
Luka Murn
87d3280847
Refactor registrations_controller code slightly
2016-11-25 09:56:07 +01:00
Oleksii Kriuchykhin
592ed802b2
Switched to use of recaptcha_input_tag helper method [SCI-706]
2016-11-24 14:19:44 +01:00
Oleksii Kriuchykhin
698e07a3b5
Enable reCaptcha and auto log in on confirm invitation form [SCI-706]
2016-11-24 14:11:02 +01:00
Mojca Lorber
beae54e278
remove already_authenticated alert flash
2016-11-23 14:55:41 +01:00
zmagod
32eea3dbdd
adds autolink to result comments
2016-11-23 14:24:51 +01:00
zmagod
fafecce264
adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]
2016-11-23 14:18:50 +01:00
Luka Murn
198febfd94
Fix user projects not working
2016-11-23 13:19:10 +01:00
Matej Zrimšek
1db926101d
Minor refactoring.
2016-11-23 10:48:43 +01:00
Matej Zrimšek
6bc2603157
Fixed tutorial overlay unexpectedly blurring the screen when not running the tutorial. [fixes SCI-707]
2016-11-23 10:36:09 +01:00
Mojca Lorber
51abd8907c
add switch to toggle email confirmations
2016-11-23 09:49:52 +01:00
Zmago Devetak
341fb13a26
Merge pull request #310 from ZmagoD/zd_add_email_login_constraints
...
adds rake task that creates a sign up email domain constraint
2016-11-23 09:16:24 +01:00
Zmago Devetak
0f3db56a74
Merge pull request #311 from ZmagoD/zd_SCI_716
...
load comments after edit step [fixes SCI-716]
2016-11-23 09:14:57 +01:00
zmagod
d75d58b159
moved email constraint to database_helper
2016-11-23 09:13:09 +01:00
Mojca Lorber
48ac289b6e
put recaptcha in helper method
2016-11-22 17:57:42 +01:00
Luka Murn
fba646bfba
Fix Hound errors
2016-11-22 15:19:12 +01:00
Luka Murn
7cbe44d1f2
Refactor user projects & user my modules code
2016-11-22 15:16:26 +01:00
Luka Murn
201b1a48d5
Refactor user my modules code
2016-11-22 15:07:18 +01:00
Luka Murn
e0607f7891
Refactor step comments code
2016-11-22 15:01:48 +01:00
Luka Murn
0c96036de8
Refactor some sample types code
2016-11-22 14:59:57 +01:00
Mojca Lorber
60f23b109b
integrate reCaptcha into sciNote
2016-11-22 14:57:41 +01:00
Luka Murn
8ff5285179
Refactor some sample groups code
2016-11-22 14:57:01 +01:00
Luka Murn
f5e286b1f6
Remove unused code for some more comments
2016-11-22 14:52:43 +01:00
zmagod
8d7285ce7c
load comments after edit step [fixes SCI-716]
2016-11-22 14:39:08 +01:00
Luka Murn
1f7a8712fb
Update task comments & task tags controllers & localized Strings
...
(Remove a lot of unused code)
2016-11-22 14:26:35 +01:00
Oleksii Kriuchykhin
d7aa155860
Disable keyboard navigation in tutorial [SCI-703]
2016-11-22 14:14:42 +01:00
Oleksii Kriuchykhin
be59b85d3b
Added additional checks for tutorial steps [SCI-703]
2016-11-22 13:55:23 +01:00
Oleksii Kriuchykhin
cc86ff268f
Reload page after exit from tutorial [SCI-703]
2016-11-22 13:49:57 +01:00
mz3944
c5bc3a4dc6
Merge pull request #303 from mz3944/mz_and_new_tutorial_steps_SCI_571_v2
...
Added additional tutorial step for showing protocol link. Tutorial st…
2016-11-21 16:06:45 +01:00
mlorb
f4aa75b4d2
Merge pull request #305 from mlorb/ml_sci_692
...
Fix empty space and blockquote padding - rich text editing [SCI-692]
2016-11-21 14:38:33 +01:00
Oleksii Kriuchykhin
d6f5f6b9bf
Changes default behaviour for absolute urls in Quill [SCI-684]
2016-11-21 14:18:08 +01:00
Luka Murn
1dff6c527e
Merge pull request #302 from Ducz0r/lm-sci-691-fix
...
Correctly import protocols with rich text [SCI-691]
2016-11-21 14:04:22 +01:00
Luka Murn
59eb1c1d18
Remove unused new, edit user_projects views
2016-11-19 17:01:10 +01:00
Luka Murn
911b7ba72f
Remove unused new user_my_module view
2016-11-19 16:59:24 +01:00
Luka Murn
6999105e51
Remove tags
2016-11-19 16:57:08 +01:00
Luka Murn
008b31df0c
Finish removing new comment forms
2016-11-19 16:54:55 +01:00
Luka Murn
595b213b1a
Changes up to samples in views folder
2016-11-19 16:51:40 +01:00
Mojca Lorber
91b0f4907c
fix hound
2016-11-18 12:54:32 +01:00
Mojca Lorber
086f937fbb
fix empty space and blockquote padding - rich text editing
2016-11-18 12:43:57 +01:00
Luka Murn
f5795f5516
Remove unused assets & helpers
2016-11-18 11:30:03 +01:00
Luka Murn
3be30c0e7a
Re-introduce fix for SCI-650 that was lost during merge
...
Closes SCI-650.
2016-11-18 10:57:03 +01:00
Matej Zrimšek
f13cc5be0e
Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).
2016-11-17 18:03:49 +01:00
Luka Murn
08c6210f7c
Also employ "no format" Nokogiri strategy when sanitizing
...
Closes SCI-691.
2016-11-17 16:43:14 +01:00
Luka Murn
fc32aa8606
Add custom scrubber for QuillJs
2016-11-17 16:43:14 +01:00
Luka Murn
26d04b1f3c
Merge branch 'rich-text-formatting' into 'master'
...
Conflicts:
Gemfile.lock
app/assets/stylesheets/themes/scinote.scss
2016-11-17 16:39:33 +01:00
Luka Murn
9d3685f872
Merge branch 'gamification' into 'master'
...
Conflicts:
app/controllers/users/invitations_controller.rb
app/controllers/users/settings_controller.rb
2016-11-17 16:30:18 +01:00
Matej Zrimšek
c8eb82cc85
Fixed tutorial step numbers and changed getting next page reference on protocols page.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
92d990a715
Code for tutorial function steps parameter reformatted. Deleted Git merging line.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
0e97bfc002
Refactored and added back button for tutorial for steps 21-22. Minor tutorial function renaming and docs update.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
c64146904a
Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
47c1308ba6
Refactored and added back button for tutorial for step 18. Tutorial function now also works with one page step.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
00ed91e856
Refactored and added back button for tutorial for steps 16-17. Tutorial now exits upon page leave.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
bfe7c19f93
Refactored and added back button for tutorial for steps 14-15.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
4ee7baabec
Enriched tutorial function description.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
33c96c9eee
Refactored and added back button for tutorial for steps 12-13.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
0687153eb8
Minor tutorial refactoring.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
f4206ea3d0
No warning popup is shown when running tutorial.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
3f8d3d5939
Refactored and added back button for tutorial for steps 6-11.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
74e58b044f
Tutorial refactored using one method, for steps 1-5.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
0d133ff32e
Refactoring and added back buttons for tutorial steps 1-5.
2016-11-17 14:46:04 +01:00
Luka Murn
d1701bd7ae
Merge pull request #276 from Ducz0r/lm-sci-637
...
Automatically resize textarea elements [SCI-637]
2016-11-17 09:58:36 +01:00
zmagod
da54d779ec
Merge branch 'rich-text-formatting' of https://github.com/biosistemika/scinote-web into zd_SCI_687
2016-11-17 08:48:40 +01:00
Luka Murn
a3bbf94643
Add a smart_text_area tag & implement it throughout application
...
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
2016-11-16 17:57:01 +01:00
Luka Murn
aadcdde417
Merge pull request #294 from Ducz0r/lm-sci-674-fix
...
Import protocol steps' rich text styling when importing protocols [SCI-674]
2016-11-16 16:59:18 +01:00
Oleksii Kriuchykhin
d2e29935cf
Improved tutorial styling [SCI-685]
2016-11-16 15:44:06 +01:00
zmagod
b781db9667
fixed bullets
2016-11-16 15:30:14 +01:00
zmagod
e5ba134e83
fixes search
2016-11-16 14:50:06 +01:00
Zmago Devetak
d3234bc52f
Merge pull request #284 from biosistemika/zd_SCI_662
...
fixes description label [fixes SCI-662]
2016-11-16 14:16:57 +01:00
zmagod
7953372d83
add description label
2016-11-16 13:59:35 +01:00
okriuchykhin
43b85ac5c2
Merge pull request #293 from okriuchykhin/ok_SCI_670
...
Fix project canvas interactivity in the tutorial [SCI-670]
2016-11-16 11:32:13 +01:00
Luka Murn
4b8824ca16
Merge pull request #291 from Ducz0r/lm-sci-676-fix
...
Allow inviting of unconfirmed user onto multiple teams [SCI-676]
2016-11-16 11:32:01 +01:00
Luka Murn
e4b3d397a0
Merge pull request #288 from Ducz0r/lm-sci-675-fix
...
Fix a bug where user could be assigned to same project twice [SCI-675]
2016-11-16 10:34:37 +01:00
Luka Murn
29f0557d3c
Prevent CORS when importing protocols
2016-11-15 17:06:39 +01:00
Luka Murn
83160a487b
Fix importer so it supports rendering & importing rich text format
...
Closes SCI-674.
2016-11-15 16:57:53 +01:00
Oleksii Kriuchykhin
410837e6cf
Fix project canvas interactivity in the tutorial [SCI-670]
2016-11-15 16:53:20 +01:00
Luka Murn
263244ad83
Reload whole page after user is invited from team invite users modal
...
Closes SCI-664.
2016-11-15 16:21:32 +01:00
Luka Murn
d425a7ad05
Merge pull request #283 from Ducz0r/lm-sci-650-fix
...
Update invited user form so it works if user inputs empty team name [SCI-650]
2016-11-15 15:59:52 +01:00
Luka Murn
eb4d031b79
Fix destroying of users in relation to notifications
2016-11-15 15:56:32 +01:00
Luka Murn
04749c3b2c
Allow inviting of existing, unconfirmed users
...
Closes SCI-676.
2016-11-15 15:04:31 +01:00
Mojca Lorber
c089832909
add validation for result text field
2016-11-15 12:55:32 +01:00
okriuchykhin
01b01939f3
Merge pull request #277 from okriuchykhin/ok_SCI_571
...
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
2016-11-15 12:05:20 +01:00
Luka Murn
7c03037643
Merge pull request #286 from Ducz0r/lm-sci-655-fix
...
Save first time tutorial Activity-s without callbacks [SCI-655]
2016-11-15 12:00:35 +01:00
mlorb
c996df7476
Merge pull request #287 from mlorb/ml_sci_665
...
Fix position of buttons in text result [SCI-665]
2016-11-15 11:27:04 +01:00
Mojca Lorber
607f1381d0
fix mobile view
2016-11-15 10:58:15 +01:00
Luka Murn
e733da728c
Fix a bug where user could be assigned to same project twice
...
Closes SCI-675.
2016-11-15 10:44:32 +01:00
Zmago Devetak
fddd7f662b
Merge pull request #281 from ZmagoD/zd_SCI_660
...
hide flash after 5 sec [fixes SCI-660]
2016-11-15 10:33:45 +01:00
Zmago Devetak
914bd42448
Merge pull request #278 from ZmagoD/zd_search_bug_with_rich_text_editor
...
strips the html tags from fearch query
2016-11-15 10:30:29 +01:00
Mojca Lorber
6afc5c5a4b
fix position of buttons in text result
2016-11-14 16:31:48 +01:00
Luka Murn
fa6d8d3020
Save first time tutorial Activity-s without callbacks
...
This PR adds a new, pretty useful little gem called sneaky-save.
Closes SCI-655
2016-11-14 15:55:44 +01:00
Mojca Lorber
7002fc3f2f
fix hound
2016-11-14 15:10:37 +01:00
Mojca Lorber
615cd3c278
profile changes for gamification
2016-11-14 15:04:18 +01:00
zmagod
67c508a891
fixes description label [fixes SCI-662]
2016-11-14 13:47:20 +01:00
zmagod
3728a6cef9
fixed sql regex
2016-11-14 12:32:41 +01:00
okriuchykhin
091cb0005e
Merge pull request #280 from okriuchykhin/ok_SCI_658
...
Show only protocols from Protocol Management in users statistics [SCI-658]
2016-11-14 09:40:12 +01:00
Luka Murn
861e7cf72d
Update invited user form so it works if user inputs empty team name
...
Closes SCI-650
2016-11-11 17:27:32 +01:00
Oleksii Kriuchykhin
2fb3041784
Fixes edit avatar link area [SCI-649]
2016-11-11 13:17:44 +01:00
mlorb
b0b2484fdf
Merge pull request #279 from mlorb/ml_sci_638_vol2
...
Fix validation problems for rich text fields [SCI-638]
2016-11-11 12:37:02 +01:00
Mojca Lorber
4d681bb63c
change strip html function
2016-11-11 12:34:57 +01:00
zmagod
59f7bdb54e
hide flash after 5 sec [fixes SCI-660]
2016-11-11 12:30:48 +01:00
Oleksii Kriuchykhin
ab895ae864
Show only protocols from Protocol Management in users statistics [SCI-658]
2016-11-11 12:14:57 +01:00
mlorb
1ca452db7b
Merge pull request #273 from mlorb/ml_sci_640
...
Add rich text formatting on results and remove markdown [SCI-640]
2016-11-11 12:06:13 +01:00
mlorb
d42adff77e
Merge pull request #275 from mlorb/ml_sci_642
...
Add formatted text in reports [SCI-642]
2016-11-11 12:04:19 +01:00
Mojca Lorber
4b7fa440f6
fix hound
2016-11-11 12:03:01 +01:00
Mojca Lorber
3b7af3e66c
fix validation logic
2016-11-11 11:42:16 +01:00
zmagod
630724df2b
strips the html tags from fearch query
2016-11-11 11:41:23 +01:00
Oleksii Kriuchykhin
b9f982ead7
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin
d2491a18a4
Tutorial Save Protocol step added [SCI-571]
2016-11-11 10:06:18 +01:00
Luka Murn
5727158495
Hotfix to nicely render comments form on Firefox as well
2016-11-11 09:47:37 +01:00
Luka Murn
b42922d32c
Add autosize functionality to all textareas
...
Closes SCI-637
2016-11-11 09:09:41 +01:00
Luka Murn
55f9633d1d
Add jQuery.autosize plugin
2016-11-11 09:09:41 +01:00
Luka Murn
acd8ce8932
Merge pull request #270 from Ducz0r/lm-sci-644
...
Convert all large text input fields into text areas (10000 characters)
2016-11-11 09:07:25 +01:00
Mojca Lorber
1facd2cefe
fix validation problems
2016-11-10 17:20:17 +01:00
Luka Murn
0e065026bd
Closes SCI-648
2016-11-10 16:18:17 +01:00
Mojca Lorber
fbaffbcaab
add formatted text in reports
2016-11-10 15:20:40 +01:00
Luka Murn
564274a588
Set invited_by field to invited users
2016-11-10 14:45:24 +01:00
Mojca Lorber
d2ae11f1af
fix hound
2016-11-10 14:16:54 +01:00
Mojca Lorber
3e162b3a93
remove redcarpet gem - markdown
2016-11-10 14:11:32 +01:00
Mojca Lorber
456c6d1ad6
Copy rich text functionality to text results
2016-11-10 12:19:59 +01:00
Mojca Lorber
ab0879e8d6
Integrate library with default settings
2016-11-09 13:09:53 +01:00
Luka Murn
c88f834ba9
Merge pull request #269 from Ducz0r/lm-sci-569
...
Add a refactored invite users modal that can be reused throughout application
2016-11-08 16:57:05 +01:00
Luka Murn
b246853117
Code styling (use link_to, %w)
2016-11-08 16:43:25 +01:00
Zmago Devetak
82a12f0fce
Merge pull request #262 from ZmagoD/zd_add_notification_types_to_constants
...
Enables notifications to be extended
2016-11-08 13:08:15 +01:00
Luka Murn
d44a757b25
Add textareas to checklist name & items
...
Closes SCI-644
2016-11-08 11:50:29 +01:00
zmagod
330afe80dc
fixes notification model
2016-11-08 11:46:09 +01:00
mlorb
0793fb9f11
Merge pull request #260 from mlorb/ml_sci_614
...
Add notification for removing user from team and removing user from project [SCI-614]
2016-11-08 11:30:49 +01:00
Luka Murn
55d8fea359
Make all comment edit fields textareas
2016-11-08 11:29:55 +01:00
Mojca Lorber
6f1c9ffb81
refactoring
2016-11-08 11:20:14 +01:00
Luka Murn
9438ba7e10
Fix a bug
2016-11-08 09:00:00 +01:00
Luka Murn
9260ed31f3
Add Deface hooks to main navbar
2016-11-07 16:57:18 +01:00
Mojca Lorber
63eb4eeaf8
fix hound
2016-11-07 15:33:21 +01:00
Mojca Lorber
27c83992b4
refactoring notification method
2016-11-07 15:31:06 +01:00
okriuchykhin
fd805f4072
Merge pull request #259 from okriuchykhin/ok_SCI_605
...
Added additional activities [SCI-605]
2016-11-07 10:01:16 +01:00
Luka Murn
ce7733e9e9
Also add notification when UserOrganization is created
2016-11-07 09:47:30 +01:00
Luka Murn
0ab62576a2
Add new modal to organization page, remove old modal code
2016-11-07 09:43:10 +01:00
Luka Murn
a188984ede
Allow strings of modal to be replaced
2016-11-07 09:43:10 +01:00
Luka Murn
6fe0d6b3df
A working invite modal!
2016-11-07 09:43:10 +01:00
Luka Murn
ccf8932611
Add first version of invite users modal
2016-11-07 09:43:09 +01:00
Oleksii Kriuchykhin
fe6724431e
Futher improvement of samples assign/unassign logging [SCI-605]
2016-11-07 09:29:56 +01:00
Oleksii Kriuchykhin
a1bfacef86
Improved samples assign/unassign logging [SCI-605]
2016-11-03 17:59:32 +01:00
Matej Zrimšek
0fe5822825
Added profile statistics data hook.
2016-11-03 17:50:32 +01:00
Mojca Lorber
a234c4c9d9
fix merge conflict problem with avatar on profile page
2016-11-03 15:23:09 +01:00
zmagod
1d6b93829c
added hooks in notifications preview
2016-11-03 14:48:01 +01:00
Oleksii Kriuchykhin
3d25da5db7
Fixed bug with protocol loading from file [SCI-605]
2016-11-03 14:15:22 +01:00
zmagod
3c9bd6f511
enables notification to be extended
2016-11-02 14:44:16 +01:00
Mojca Lorber
44b51d087a
merging
2016-11-02 14:06:20 +01:00
Mojca Lorber
749b108928
fix hound
2016-11-02 13:32:15 +01:00
Mojca Lorber
a2213e23b3
add notification for removing user from team and removing user from project
2016-11-02 11:52:41 +01:00
Oleksii Kriuchykhin
e8d20dfc01
Added additional activities [SCI-605]
2016-11-02 10:43:36 +01:00
Zmago Devetak
6e022699eb
Merge pull request #256 from ZmagoD/add_getting_started_flash_hook
...
Added getting started hoot to layout/application.html
2016-10-28 16:19:20 +02:00
zmagod
01b27e9e6d
added getting started hoot to layout/application.html
2016-10-28 10:36:15 +02:00
Mojca Lorber
91ec201fd0
make image clickable
2016-10-27 16:18:31 +02:00
Oleksii Kriuchykhin
d28edfb488
Added statistics block in users profile [SCI-566]
2016-10-27 13:44:27 +02:00
Mojca Lorber
888aa31aed
fix hound
2016-10-27 11:18:11 +02:00
Mojca Lorber
5719d4c61f
show edit avatar on mouse hover, add background and center image
2016-10-27 11:09:30 +02:00
Mojca Lorber
8309df0aaf
fix hound
2016-10-26 13:51:05 +02:00
Mojca Lorber
878952f072
change edit avatar in profile
2016-10-26 13:41:17 +02:00
Luka Murn
b4685b0a40
Remove console.log()
2016-10-25 18:13:29 +02:00
Luka Murn
cd360d7279
Fix the save report alert() bug
...
Closes SCI-616
2016-10-25 18:12:29 +02:00
Luka Murn
eec6b1403d
Merge pull request #247 from Ducz0r/lm-hotfix-blank-current-org
...
Add check in application controller to always set current org if nil
2016-10-25 11:53:05 +02:00
Zmago Devetak
266d1415d0
Merge pull request #246 from ZmagoD/zd_SCI_599
...
fixes error when removing user from team [SCI-599]
2016-10-25 11:52:44 +02:00
Luka Murn
7885fd0f39
Add check in application controller to always set current org if nil
2016-10-25 11:39:57 +02:00
zmagod
6a328969f0
reset current_user if the user leaves the team [fixes SCI-599]
2016-10-25 09:53:02 +02:00
zmagod
24b81c96f6
sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608]
2016-10-24 21:20:41 +02:00
zmagod
e02132578a
first run
2016-10-24 20:07:20 +02:00
Luka Murn
b13fd22408
Add back the release notes URL to navbar
...
Closes SCI-604
2016-10-24 16:59:32 +02:00
Zmago Devetak
12c77df883
Merge pull request #237 from ZmagoD/zd_SCI_593_v2
...
Styled global team switch and search [fixes SCI-593]
2016-10-21 16:28:50 +02:00
zmagod
9a4603dd7d
removed unneeded css
2016-10-21 16:27:53 +02:00
Luka Murn
388e092bbf
Merge pull request #238 from Ducz0r/lm-sci-596-fix
...
SCI-596 fix
2016-10-21 11:59:01 +02:00
zmagod
49d3879642
fixes padding on mobile, added separator on team switch dropdown, focus search input
2016-10-21 11:46:59 +02:00
Zmago Devetak
4f5b7ad8ad
Merge pull request #228 from ZmagoD/zd_SCI_585
...
Removes archived projects from index page [fixes SCI-585]
2016-10-21 11:33:01 +02:00
Luka Murn
7b825a217f
Closes SCI-596
2016-10-21 11:08:47 +02:00
Zmago Devetak
af0e9b99b6
Merge pull request #233 from ZmagoD/zd_SCI_591
...
Move tooltip to the right [fixes SCI-591]
2016-10-21 10:38:25 +02:00
okriuchykhin
f876ade05e
Merge pull request #236 from okriuchykhin/ok_SCI_557
...
Fixes issue with new comments and date separator SCI-557
2016-10-21 10:29:46 +02:00
Oleksii Kriuchykhin
5be7904f5a
Fix hound warnings [SCI-557]
2016-10-21 09:37:24 +02:00
zmagod
c642e208dd
styled global team switch and search [fixes SCI-593]
2016-10-21 09:33:18 +02:00
zmagod
db806f3c10
hide private projects
2016-10-21 09:06:19 +02:00
Zmago Devetak
f615b3da41
Merge pull request #230 from ZmagoD/zd_SCI_586
...
Adds new team button to team switch dropdown [fixes SCI-586]
2016-10-21 08:29:05 +02:00
Oleksii Kriuchykhin
0c1ff06f21
Fixes issue with new comments and date separator SCI-557
2016-10-20 22:33:15 +02:00
Zmago Devetak
094e989af5
Merge pull request #227 from ZmagoD/zd_SCI_587
...
Removes org selector form project archive [fixes SCI-587]
2016-10-20 16:32:46 +02:00
zmagod
9214adc591
fixed team name position
2016-10-20 15:35:09 +02:00
mlorb
fa4f3fb0a0
Merge pull request #220 from mlorb/ml_sci_462
...
fix multiplication of edit comment fields [SCI-462]
2016-10-20 15:14:31 +02:00
zmagod
f9fb4d8bd6
move tooltip to the right [fixes SCI-591]
2016-10-20 14:34:45 +02:00
Oleksii Kriuchykhin
347216183f
Fixes different color of buttons in notifications settings [SCI-590]
2016-10-20 14:17:07 +02:00
zmagod
f21c9e394f
adds new team button to team switch dropdown [fixes SCI-586]
2016-10-20 13:47:41 +02:00
zmagod
4c086a6fc1
removes archived projects from index page [fixes SCI-585]
2016-10-20 13:13:44 +02:00
zmagod
8aaf58f75f
removes org selector form project archive [fixes SCI-587]
2016-10-20 12:50:55 +02:00
Luka Murn
640a575a3a
Merge pull request #222 from biosistemika/modular-tasks
...
Merge global team switch into master
2016-10-18 11:39:09 +02:00
zmagod
76f6e30078
fixes word-wrap on mozilla
2016-10-17 15:36:33 +02:00
zmagod
557957c857
fixed issue with mozilla browsers
2016-10-17 15:21:19 +02:00
zmagod
54a3237994
displays org name on the project index page if no project
2016-10-17 15:21:19 +02:00
zmagod
8a6899aeea
restyled team switch dropdown
2016-10-17 15:21:19 +02:00
zmagod
a116feac9c
fixed typos and added truncation to org name
2016-10-17 15:21:19 +02:00
zmagod
1614cbc2b2
fixes repeat tutorial button and localization typos
2016-10-17 15:16:22 +02:00
zmagod
931cba2666
fixes hound [fixes SCI-512]
2016-10-17 15:10:26 +02:00
zmagod
e85ed788f2
fixed user_generator
2016-10-17 15:10:26 +02:00
zmagod
fa36488397
fixed new project form
2016-10-17 15:10:26 +02:00
zmagod
8f24d0d80c
fixed new user registration
2016-10-17 15:10:26 +02:00
zmagod
8cd86a50bb
styled dropdown
2016-10-17 15:10:26 +02:00
zmagod
3117a464f0
fixed controllers
2016-10-17 15:10:26 +02:00
zmagod
bb9c03df24
fixes controllers
2016-10-17 15:10:26 +02:00
zmagod
d7f514db09
fixes search
2016-10-17 15:10:26 +02:00
zmagod
efe031d766
setup current_organization in all controllers
2016-10-17 15:10:26 +02:00
zmagod
d86a4dd311
setup global team switch view and controller action
2016-10-17 15:10:26 +02:00
Oleksii Kriuchykhin
0ec7c019b3
Fix issue with pop-up windows and turbolinks [SCI-463]
2016-10-17 14:25:54 +02:00
Mojca Lorber
177c4b5918
fix multiplication of edit comment fields
2016-10-17 12:59:51 +02:00
Matej Zrimšek
a31753ea39
Added additional color constants. Fix Ruby color constants RGB format so no errors occur for external Gems.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
f2cd9890dd
Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
a6a2a237aa
Removed unneeded ERB tags, which caused error. Minor refactoring.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
ece89da391
Removed ruby constants duplicates in JS, because of caching problems.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
5966911b92
Fixed Hound alerts.
2016-10-17 11:57:46 +02:00
Matej Zrimšek
778ed8814b
Removed some unneeded code.
2016-10-17 11:57:46 +02:00
Matej Zrimšek
05acf5a725
Replaced all Ruby constants instances in JS to be called from JS.
2016-10-17 11:57:46 +02:00
Matej Zrimšek
0780bd2416
Ruby constants are now automatically available in JS. Refactoring was needed.
2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558
Added remaining constants.
2016-10-17 11:30:05 +02:00
Matej Zrimšek
21ec05d541
Refactored searches (user and globals earch) and used constants.
2016-10-17 11:17:59 +02:00
Luka Murn
845d487fa1
Merge pull request #218 from Ducz0r/lm-mail-previews
...
Add notification mailer preview
2016-10-13 14:58:04 +02:00
Oleksii Kriuchykhin
c6fb57318f
Added use of constants in JS [SCI-530]
2016-10-13 13:06:11 +02:00
Luka Murn
02d3e03f75
Bugfix for notification emails
...
The URLs in notification emails didn't get server URL prepended,
so users could not click on them.
2016-10-13 12:12:28 +02:00
Oleksii Kriuchykhin
37cff75013
Fixes issue with comments options menu [SCI-530]
2016-10-13 12:07:41 +02:00
mlorb
cbc14d9d50
Merge pull request #211 from mlorb/ml_sci_491
...
change 80s glow [SCI-491]
2016-10-13 10:13:14 +02:00
Mojca Lorber
c51aedb178
change thickness of shadow
2016-10-13 10:11:32 +02:00
Luka Murn
bdaeb4db13
Add notification mailer preview
2016-10-13 08:56:04 +02:00
mlorb
78f7879c04
Merge pull request #216 from mlorb/ml_sci_555
...
Adding update notifications in settings [SCI-555]
2016-10-13 08:53:55 +02:00
Mojca Lorber
8f783f87f7
fixes hound
2016-10-12 15:32:40 +02:00
Mojca Lorber
42f6b679f8
Adding system notifications email function in settings
2016-10-12 11:50:26 +02:00
Mojca Lorber
6bea0a9e1a
fixes merge conflicts
2016-10-12 10:55:40 +02:00
Luka Murn
cccabcdd7b
Remove invitation_to_organization email
...
This email is no longer needed, because if user enables
assignment notifications, he/she will already receive an
email whenever he/she is added to a new organization/team (via
notifications email).
2016-10-12 10:54:36 +02:00
Mojca Lorber
4f1cbad7da
adding update notifications in settings
2016-10-12 10:42:07 +02:00
Zmago Devetak
f25767fdc3
Merge pull request #209 from ZmagoD/zd_SCI_534_remove_popup
...
Removed introductory popup [fixes SCI-534]
2016-10-12 08:13:46 +02:00
Zmago Devetak
b225dc1e29
Merge pull request #210 from ZmagoD/zd_SCI_548_protocol_steps_not_visible
...
Fixes protocol steps [fixes SCI-548]
2016-10-12 08:13:28 +02:00
Oleksii Kriuchykhin
4c6a60c249
Added html_safe to notification email template
2016-10-11 16:46:20 +02:00
Oleksii Kriuchykhin
90c853743c
Additional fixes to email markup and logic [SCI-443]
2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
3f219e1bfe
Hound code style fixes [SCI-443]
2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
5399033fce
Added user settings for email notifications [SCI-443]
2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
8dc956010c
Initial code commit [SCI-443]
2016-10-11 16:43:17 +02:00
Mojca Lorber
b1b23b8f41
fixes hound
2016-10-11 10:39:00 +02:00
Mojca Lorber
63ec63047d
change 80s glow
2016-10-11 10:33:26 +02:00
Zmago Devetak
692b31325b
Merge pull request #206 from ZmagoD/zd_SCI_561
...
Fixed assinement icon [fixes SCI-561]
2016-10-11 09:32:47 +02:00
zmagod
ea305b356a
fixes protocol steps [fixes SCI-548]
2016-10-11 09:10:12 +02:00
zmagod
42a30576e3
removed introductory popup [fixes SCI-534]
2016-10-11 08:33:50 +02:00
Luka Murn
448daab7c8
Merge pull request #207 from biosistemika/add-deface-hotfix
...
Merge hotfix 1.3.1 into master
2016-10-07 18:26:13 +02:00
zmagod
fe7b367eae
fixed hound
2016-10-07 15:25:53 +02:00
zmagod
130db6a2c3
fixed assignment icon [fixes SCI-561]
2016-10-07 12:27:44 +02:00
zmagod
32f03ec94c
Add Deface hooks
2016-10-06 16:47:36 +02:00
Jure Grabnar
1f67aec258
Prevent destroying protocols when file is edited
...
SCI-552 #close
2016-10-06 16:13:42 +02:00
Jure Grabnar
b52e596209
Update protocol timestamp on put_file
...
SCI-551 #close
2016-10-06 14:37:42 +02:00
zmagod
0bdf77562d
add word-wrap to notrification index page [fixes SCI-556]
2016-10-06 13:49:24 +02:00
zmagod
de00a19dd9
fixes styling in settings preferences [SCI-553]
2016-10-06 13:22:44 +02:00
zmagod
5b3889c172
notification index images [fixes SCI-554]
2016-10-06 12:09:01 +02:00
Luka Murn
5c80c8a817
Add "no notifications" to dropdown & notifications index page
2016-10-05 16:58:21 +02:00
Luka Murn
877574e853
Add link to settings from both notification lists
2016-10-05 16:26:26 +02:00
Luka Murn
56d2240de5
Optimize data query in user_notification.rb
2016-10-05 16:21:13 +02:00
Oleksii Kriuchykhin
083a09c2f7
Add link to notifications index page
2016-10-05 16:13:05 +02:00
okriuchykhin
50f28fe883
Merge pull request #193 from okriuchykhin/ok_global_notifications-SCI-442
...
Global notifications screen [SCI-442]
2016-10-05 16:01:41 +02:00
Oleksii Kriuchykhin
4e2ad1d5e6
Fix the issues after code review [SCI-442]
2016-10-05 15:54:31 +02:00
Oleksii Kriuchykhin
c783e9a03d
Code fix after rebase with latest master [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
d2b48e94bd
CSS color fix [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
868ffd03d6
JS code improvement [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
246dae4f46
Code style improvements according to hound [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8907e54b49
Global notifications index page added [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8b5b0723d1
Initial code commit
2016-10-05 15:51:11 +02:00
Zmago Devetak
f3708bcac0
Merge pull request #191 from ZmagoD/zd_SCI_469_ver2
...
Comments date duplication
2016-10-05 15:47:42 +02:00
zmagod
b0f6b1f4d0
fixed comments action on project page
2016-10-05 15:39:54 +02:00
Zmago Devetak
eea310514a
Merge pull request #194 from ZmagoD/zd_SCI_531_533
...
Notification style fixes
2016-10-05 15:27:36 +02:00
zmagod
bca3d19562
fixed comment options dropdown position
2016-10-05 15:26:11 +02:00
Zmago Devetak
71ad5bf034
Merge pull request #190 from ZmagoD/zd_SCI_529
...
Prepare settings screen for notifications
2016-10-05 14:54:47 +02:00
Zmago Devetak
c547d8a07a
Merge pull request #195 from ZmagoD/zd_SCI_532
...
add word wrapping to notifications dropdown [fixes SCI-532]
2016-10-05 14:54:10 +02:00
zmagod
dfcbebbf4f
cleaned up bootstrap extension
2016-10-05 14:49:23 +02:00
okriuchykhin
bfa7e57bd8
Merge pull request #168 from okriuchykhin/ok_SCI-463
...
Fixes issue with unexpected notification windows [fixes SCI-463]
2016-10-05 14:45:23 +02:00
zmagod
9c7a690944
fixed type, fixed settings controller, fixes setting view on mobile devices
2016-10-05 14:33:22 +02:00
zmagod
cba4318185
add word wrapping to notifications dropdown [fixes SCI-532]
2016-10-05 13:22:33 +02:00
zmagod
5bf278298b
fixed navbar on sceens smaller than 1000px
2016-10-05 12:22:27 +02:00
zmagod
f9d956bbca
fix notifications number on [fixes SCI-531]
2016-10-05 11:50:57 +02:00
zmagod
c4f28c3649
made notification images bigger [fixes SCI-533]
2016-10-05 10:16:51 +02:00
zmagod
848beb5d4b
minor fix
2016-10-05 09:46:18 +02:00
zmagod
d7a4f85ba1
added links to notification project name and task
2016-10-05 09:40:44 +02:00
zmagod
d90f17d1eb
clean comments date duplication [fixes SCI-469]
2016-10-05 08:42:32 +02:00
Jure Grabnar
62356c36a1
Add file extension to global search
2016-10-04 19:04:08 +02:00
Jure Grabnar
85d2370d28
Change some values to string in CheckFileInfo
2016-10-04 18:19:36 +02:00
Jure Grabnar
3e74c96085
Add wd* params to iframe action url
2016-10-04 18:00:08 +02:00
zmagod
6229e6a3a1
styled notification settings button [fixes SCI-529]
2016-10-04 16:12:56 +02:00
zmagod
a68e7abc57
first run notification settings
2016-10-04 15:52:48 +02:00
Jure Grabnar
0c7cd52dba
Add WOPI icons/buttons to files
2016-10-04 12:34:43 +02:00
Luka Murn
61cb9651c7
Merge pull request #188 from biosistemika/global-notifications
...
Global notifications
2016-10-04 08:30:50 +02:00
zmagod
c9bbab1004
added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users
2016-10-03 20:31:00 +02:00
Jure Grabnar
72c5824e67
Remove navbar for viewing WOPI files
2016-10-03 20:02:13 +02:00
Jure Grabnar
ec82f64df2
Add WOPI breadcrumbs
2016-10-03 19:45:39 +02:00
Jure Grabnar
1949b1fe88
Add CloseUrl to WOPI
2016-10-03 18:25:01 +02:00
mlorb
00b0f6ab07
Merge pull request #184 from mlorb/ml_sci_472
...
Protocol steps/results - change title for comment section, remove info tab [SCI-472]
2016-10-03 17:20:45 +02:00
Jure Grabnar
03567d6208
Prevent archive of locked result asset
2016-10-03 17:07:57 +02:00
mlorb
153b692c0c
Merge pull request #181 from mlorb/ml_sci_321
...
Displaying more information for individual samples in Sample table [SCI-321]
2016-10-03 16:37:35 +02:00
Mojca Lorber
3b0185a45b
change title of modal
2016-10-03 16:33:58 +02:00
zmagod
0d23f05698
Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440
2016-10-03 16:14:22 +02:00
zmagod
36fb2713b3
start fixing comments dates
2016-10-03 16:10:20 +02:00
Zmago Devetak
84313a28a0
Merge pull request #186 from ZmagoD/zd_SCI_441_vol2
...
code notifications in toolbar
2016-10-03 16:09:04 +02:00
Zmago Devetak
91c7d8a952
Merge pull request #176 from ZmagoD/zd_SCI_474
...
Unify the comments
2016-10-03 15:26:17 +02:00
Oleksii Kriuchykhin
a39c948c5f
System notifications code rework
2016-10-03 15:21:26 +02:00
Jure Grabnar
f727289935
Add lock check for editing result
2016-10-03 13:43:35 +02:00
zmagod
77df0bc82c
cleans more comment link
2016-10-03 12:34:16 +02:00
zmagod
947096862d
fixed hound
2016-10-03 11:40:59 +02:00
zmagod
ea17182372
generate notifications [fixes SCI-440]
2016-10-03 11:37:29 +02:00
Mojca Lorber
093fbd6b8e
fixes hound again
2016-10-03 10:40:32 +02:00
Mojca Lorber
2041f2a09d
fixes hound
2016-10-03 10:15:46 +02:00
Mojca Lorber
053cd8ed84
removes handler
2016-10-03 10:12:13 +02:00
Mojca Lorber
5b32be2137
adding subtitle in modal
2016-10-03 09:28:58 +02:00
zmagod
b9bc2f17c8
fixing hound
2016-10-03 08:27:13 +02:00
zmagod
2ee02ec472
mark all seen notifications
2016-10-03 08:20:23 +02:00
Jure Grabnar
1e14955ade
Prevent deleting asset on step update
2016-10-01 18:47:05 +02:00
Jure Grabnar
d9fa882d6a
Add check for locked files on step delete
2016-10-01 14:51:55 +02:00
Jure Grabnar
5c9e995e56
Don't delete asset on locked
2016-10-01 13:23:04 +02:00
Jure Grabnar
a2d6d9a29a
Add WOPI controlls to result
2016-10-01 11:23:32 +02:00
Jure Grabnar
a6ebff06a7
Add error message to wopi discovery
...
Fix ambigious open call
2016-09-30 10:39:14 +02:00
Oleksii Kriuchykhin
f5cc2fe225
Code style fixes
2016-09-30 09:34:58 +02:00
Luka Murn
f70829d1a9
Merge pull request #179 from okriuchykhin/ok_SCI-380
...
Fixes ordering of checklist items in search results [SCI-380]
2016-09-30 08:28:07 +02:00
Luka Murn
49c5474219
Merge pull request #178 from mz3944/mz_help_button_SCI_13_v2
...
Fixed wrong CSS formatting and added release notes link to help link.
2016-09-30 08:27:57 +02:00
Luka Murn
e32e0a232c
Merge pull request #177 from okriuchykhin/ok_SCI-480
...
Fixes issue with scrollbar on sidebar [SCI-480]
2016-09-30 08:25:54 +02:00
Luka Murn
12c9f9a42f
Merge pull request #175 from okriuchykhin/ok_SCI-423
...
Fix issue with spinner in avatar upload [SCI-423]
2016-09-30 08:25:15 +02:00
Luka Murn
380d0740f8
Merge pull request #174 from okriuchykhin/ok_SCI-477
...
Fix issue with words break in task description and comments [SCI-477]
2016-09-30 08:25:04 +02:00
Luka Murn
c83342d9f0
Merge pull request #173 from okriuchykhin/ok_SCI-484
...
Fix issue with duplicate error messages in experiments modal [SCI-484]
2016-09-30 08:24:51 +02:00
Luka Murn
b1d25cb18f
Merge pull request #172 from ZmagoD/zd_SCI_465
...
Generate new experiment img after task restored [fixes SCI-465]
2016-09-30 08:24:31 +02:00
Oleksii Kriuchykhin
036bda3afa
Initial code for system notifications [SCI-444]
2016-09-29 16:51:27 +02:00
Mojca Lorber
35477b1005
Remove Info tab and change comment title on results view
2016-09-29 16:43:19 +02:00
Jure Grabnar
ff47f29dc2
Add wopi file activity
...
SCI-393 #close
2016-09-29 16:16:42 +02:00
zmagod
60a503f115
added assignment image
2016-09-29 16:05:43 +02:00
zmagod
e1a1b93d44
fixed migrations
2016-09-29 14:49:58 +02:00
Mojca Lorber
c9fbf845f1
Remove Info tab and change comment title
2016-09-29 14:37:29 +02:00
Matej Zrimšek
a6324d61c5
Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab.
2016-09-29 14:27:26 +02:00
Mojca Lorber
5d905f0094
refactoring
2016-09-29 14:18:04 +02:00
Luka Murn
f1b74f1906
Fix image names in introductory popup
...
This will make sure browsers don't display old, cached images to clients.
2016-09-29 13:44:38 +02:00
Jure Grabnar
ed8df3cc62
Add favicon url to iframe
2016-09-29 12:19:29 +02:00
Jure Grabnar
3bc683be8f
Fix access_token_ttl calculation
2016-09-29 10:57:08 +02:00
Jure Grabnar
bc22697ebe
Take/release space in putfile
2016-09-28 18:02:47 +02:00
Jure Grabnar
5e5f4c5ed4
Add text extraction on unlock
2016-09-28 17:36:53 +02:00
Jure Grabnar
02ddd64aaa
Set last_modified_by on put_file
2016-09-28 17:00:19 +02:00
Mojca Lorber
f4345f3aef
fixes hound
2016-09-28 16:09:39 +02:00
zmagod
cab1e9b521
start implement toolbar view
2016-09-28 16:03:52 +02:00
Mojca Lorber
efa7a1d7b5
add sample information in pop-up
2016-09-28 15:46:41 +02:00
zmagod
2a86aaf7e4
changed popout content [fixes SCI-520]
2016-09-28 15:12:30 +02:00
zmagod
485497334d
generated notification related migrations and model tests
2016-09-28 14:18:52 +02:00
Jure Grabnar
e96e8486ea
Add check file permissions to assets controller
...
SCI-502 #close
2016-09-28 09:33:44 +02:00
Jure Grabnar
25c9ec67b3
Check permissions in wopi_controller
2016-09-28 09:33:44 +02:00
Jure Grabnar
5aea0fbb19
Refactor the rest of WOPI logic from Nejc
2016-09-28 09:33:44 +02:00
Jure Grabnar
c1ae4360a3
Refactor WopiController
2016-09-28 09:33:44 +02:00
Jure Grabnar
0c9292e4fc
Catch GET_SHARE_URL post file action
2016-09-28 09:33:44 +02:00
Jure Grabnar
3600fbfe64
Fix UnlockUnlockedFile action
...
The time was nigh!
2016-09-28 09:33:44 +02:00
Jure Grabnar
674326e761
Add timestamp WOPI checking
...
Change status error code to 500.
2016-09-28 09:33:44 +02:00
Jure Grabnar
b51f2a3027
Add basic WOPI proof checking
...
Still missing validation of timestamp.
Remove web_console gem for testing.
Add relevant tests from manual for WOPI proof.
2016-09-28 09:33:44 +02:00
Jure Grabnar
0e9756ad94
Fix bad step view rebase
2016-09-28 09:33:44 +02:00
Nejc Bernot
1b260785ec
First working version of office integration
...
Only works on scinote-preview
2016-09-28 09:33:44 +02:00
Nejc Bernot
b2b1d5a8f5
Initial commit of WOPI integration
2016-09-28 09:33:44 +02:00
zmagod
dad0d3868b
fixing hound
2016-09-27 17:31:37 +02:00
zmagod
402a77526a
cleaned console.log
2016-09-27 16:22:09 +02:00
zmagod
2235778110
fixed project and task comments + fixed date issue
2016-09-27 16:19:31 +02:00
Oleksii Kriuchykhin
366a49f3a1
Fixes ordering of checklist items in search results [SCI-380]
2016-09-27 13:00:51 +02:00
zmagod
0d322eba13
fixed hound
2016-09-27 11:03:10 +02:00
zmagod
4903cb970c
removed comments helper
2016-09-27 10:47:18 +02:00
Oleksii Kriuchykhin
f9e5d204bb
Fixes issue with scrollbar on sidebar [SCI-480]
2016-09-27 10:43:07 +02:00
zmagod
1eb9f772f4
refactor sciNote comments js and unified all comments behavior [fixes SCI-474]
2016-09-27 10:30:48 +02:00
zmagod
1cdfde827f
fixes protocol and results comments
2016-09-27 09:26:25 +02:00
zmagod
980ff63104
fixed task comments
2016-09-27 09:18:46 +02:00
Oleksii Kriuchykhin
792f949a61
Fix issue with spinner in avatar upload [SCI-423]
2016-09-27 09:12:31 +02:00
zmagod
02bfa1949e
fixed project comments
2016-09-27 09:00:02 +02:00
Oleksii Kriuchykhin
908ee05a23
Fix issue with words break in task description and comments [SCI-477]
2016-09-26 16:03:22 +02:00
Oleksii Kriuchykhin
8a3a9451e9
Fix issue with duplicate error messages in experiments modal [SCI-484]
2016-09-26 12:58:22 +02:00
zmagod
30a8f52216
generate new experiment img after task restored [fixes SCI-465]
2016-09-26 09:48:49 +02:00
Mojca Lorber
cc5cdf2577
Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321
2016-09-26 09:39:05 +02:00
Oleksii Kriuchykhin
db1e24202a
Minor code cleanup [fixes SCI-463]
2016-09-26 09:08:38 +02:00
Mojca Lorber
c2b742374f
adding popup sample info
2016-09-23 17:45:02 +02:00
mz3944
1c1a7c231e
Merge pull request #169 from mz3944/mz_help_button_SCI_13
...
Added help dropdown. [SCI-13]
2016-09-23 13:04:38 +02:00
okriuchykhin
4f0fb7074b
Merge pull request #167 from okriuchykhin/ok_SCI-470
...
Fix issue with long tags in dropdown list [fixes SCI-470]
2016-09-23 13:00:06 +02:00
Matej Zrimšek
fc86b7b1fd
Added help dropdown. [SCI-13]
2016-09-23 12:52:38 +02:00
Oleksii Kriuchykhin
2c144aa2f3
Fix issue with unexpected notification windows appearing after report editor exit [fixes SCI-463]
2016-09-23 11:56:13 +02:00
Oleksii Kriuchykhin
e8ac754829
Fix issue with long tags in dropdown list [fixes SCI-470]
2016-09-23 11:05:17 +02:00
okriuchykhin
a7f3f793c8
Merge pull request #161 from okriuchykhin/ok_SCI-380
...
Fixes issue with reordering of checklist items [fixes SCI-380]
2016-09-23 10:37:56 +02:00
okriuchykhin
5896cdc4bc
Merge pull request #158 from okriuchykhin/ok_SCI_314
...
Fixes issue with import of empty protocol [fixes SCI-314]
2016-09-23 10:37:35 +02:00
Zmago Devetak
2b678998d3
Merge pull request #166 from ZmagoD/zd_SCI_471
...
fixes load comments [fixes SCI-471]
2016-09-23 09:17:27 +02:00
zmagod
4f2df691ba
add error validations
2016-09-23 08:34:39 +02:00
zmagod
6143b257d0
fixes edit modal [fixes SCI-467]
2016-09-23 08:32:46 +02:00
Matej Zrimšek
0317872bc0
Added check if no comments are present for file result, which caused JS error.
2016-09-22 18:12:35 +02:00
mz3944
cde7f3805f
Merge pull request #165 from mz3944/mz_replace_hardcoded_values_with_constants_v2
...
Added missing validation for protocol description.
2016-09-22 17:36:18 +02:00
Matej Zrimšek
13e886f7a9
Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408]
2016-09-22 17:35:23 +02:00
okriuchykhin
087ee08976
Merge pull request #164 from okriuchykhin/ok_SCI-400
...
Fixes issue with new experiment modal and with move of experiments [fixes SCI-400]
2016-09-22 17:01:58 +02:00
Oleksii Kriuchykhin
841e495234
Fix brace position [fixes SCI-380]
2016-09-22 16:48:15 +02:00
okriuchykhin
b5c861583d
Merge pull request #157 from okriuchykhin/ok_SCI_430
...
Fixes issue with unneeded sort icon [fixes SCI-430]
2016-09-22 16:39:26 +02:00
Oleksii Kriuchykhin
28ab599373
Change double quotes to single [fixes SCI-314]
2016-09-22 16:36:37 +02:00
okriuchykhin
729cbef27b
Merge pull request #156 from okriuchykhin/ok_SCI-459
...
Fixes issue with too many " | " signs in error message [fixes SCI-459]
2016-09-22 16:12:17 +02:00
okriuchykhin
37eedf17a0
Merge pull request #155 from okriuchykhin/ok_SCI-451
...
Fixes issue with zoom buttons on canvas [fixes SCI-451]
2016-09-22 16:11:45 +02:00
Matej Zrimšek
09405c667e
Added missing validation for protocol description. [SCI-408]
2016-09-22 15:52:12 +02:00
Oleksii Kriuchykhin
0dd1196ae5
Fixes issue with move of experiments between projects [fixes SCI-400]
2016-09-22 15:10:15 +02:00
zmagod
303cb4308a
fixes load comments [fixes SCI-471]
2016-09-22 13:46:27 +02:00
Oleksii Kriuchykhin
b334b037f8
Fixes issue with old data in modal fields [fixes SCI-400]
2016-09-22 10:54:03 +02:00
Matej Zrimšek
c614843044
Minor refactoring with hound alert fixes.
2016-09-21 19:48:18 +02:00
Matej Zrimšek
234918a76d
Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits.
2016-09-21 19:48:18 +02:00
Matej Zrimšek
c6a23aab98
Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408]
2016-09-21 19:37:36 +02:00
Zmago Devetak
5fedcb4be2
Merge pull request #160 from ZmagoD/zd_SCI_464
...
Fixes restore experiment error [fixes SCI-464]
2016-09-21 19:24:33 +02:00
zmagod
06b1992e94
Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436
2016-09-21 19:20:55 +02:00
zmagod
8a8bf10f08
clean up flash label
2016-09-21 19:09:57 +02:00
Oleksii Kriuchykhin
011bb2d910
Fixes issue with reordering of checklist items [fixes SCI-380]
2016-09-21 14:06:47 +02:00
zmagod
bf8e2a208f
fixes restore experiment error [fixes SCI-464]
2016-09-21 08:34:32 +02:00
zmagod
2bfe8f0636
fixing hound
2016-09-21 08:16:23 +02:00
zmagod
9f56df02d2
removes comment tab and add comment in the info tab [fixes SCI-436]
2016-09-20 18:53:51 +02:00
zmagod
42bbc47f5f
first working version
2016-09-20 17:06:07 +02:00
zmagod
da86208441
styled step comments
2016-09-20 14:13:40 +02:00
Oleksii Kriuchykhin
9b7360eebf
Fixes issue with import of empty protocol [fixes SCI-314]
2016-09-20 13:41:29 +02:00
zmagod
0ca65aeca5
fixed step comment sorting
2016-09-20 13:31:50 +02:00
Oleksii Kriuchykhin
411ee4ee77
Fixes issue with unneeded sort icon [fixes SCI-430]
2016-09-20 11:30:11 +02:00
zmagod
cd64e035c0
set form validations
2016-09-20 09:50:03 +02:00
zmagod
f48553e807
fixed ajax call
2016-09-19 16:12:07 +02:00
Oleksii Kriuchykhin
3f0a2c7dfc
Fixes issue with too many " | " signs in error message [fixes SCI-459]
2016-09-19 13:53:24 +02:00
Oleksii Kriuchykhin
a3b00d0ff8
Fixes issue with zoom buttons on canvas [fixes SCI-451]
2016-09-16 16:27:54 +02:00
Matej Zrimšek
ffe6799313
Fixed hound alerts.
2016-09-16 15:57:54 +02:00
Matej Zrimšek
dd6e8a3a9a
Added step name word wrapping (needs to be improved).
2016-09-16 15:57:54 +02:00
Matej Zrimšek
20ca37f185
Readded client-side result's comment validation.
2016-09-16 15:57:54 +02:00
Matej Zrimšek
c2f0106993
Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]
2016-09-16 15:56:44 +02:00
zmagod
938aa32190
js tweaks
2016-09-16 15:22:24 +02:00
zmagod
635f6b92d6
fixed comments display
2016-09-16 11:55:10 +02:00
Zmago Devetak
431227c0a4
Merge pull request #147 from maslick/resultCommentsError1000Chars
...
Fixed: Comments in results have no error message if the text exceeds 1000 characters
2016-09-16 09:38:38 +02:00
zmagod
b9b466cd8e
Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas
2016-09-16 09:28:19 +02:00
mz3944
556238f39f
Merge pull request #150 from mz3944/mz_local_file_upload_fix
...
URL presigning is now used only when using S3 file uploading (caused …
2016-09-16 09:17:23 +02:00
zmagod
e90f0bd3d5
refactor step view
2016-09-16 09:04:21 +02:00
Zmago Devetak
01656c1018
Merge pull request #153 from ZmagoD/zd_SCI_448
...
Wrong name of experiment and task - gets undefined as prefix
2016-09-15 15:00:34 +02:00
mlorb
587369e7a6
Merge pull request #152 from mlorb/ml_sci_428
...
fixes responsiveness on mobile phone for sample view [SCI-428]
2016-09-15 12:11:48 +02:00
Zmago Devetak
7c4a62d138
Merge pull request #139 from ZmagoD/zd_SCI_410
...
fixed moved experiment thumbnail [fixes SCI-410]
2016-09-15 11:58:48 +02:00
zmagod
779b713148
refactor code
2016-09-15 11:55:02 +02:00
zmagod
0a2ab57e28
styled new comments layout
2016-09-15 11:45:51 +02:00
zmagod
d146970f6b
add generate workflow image method for moved modules
2016-09-15 09:32:29 +02:00
zmagod
e3ae22763e
removed comments tab in protocol step
2016-09-15 08:46:14 +02:00
mlorb
098e17c0d8
Merge pull request #149 from mlorb/ml_sci_420
...
fixes links and missing experiment level in search results [SCI-420]
2016-09-14 15:42:16 +02:00
Zmago Devetak
d0a180a1e8
Merge pull request #148 from ZmagoD/zd_SCI_342
...
fixes sidebar expanded elements when adding new experiments
2016-09-14 13:48:34 +02:00
Mojca Lorber
65415415b6
fixes hound again again
2016-09-14 11:37:17 +02:00
Mojca Lorber
386cedda71
fixes hound again
2016-09-14 11:34:24 +02:00
Mojca Lorber
aba5305cd6
fixes hound
2016-09-14 11:24:19 +02:00
zmagod
c4fabdb67a
clean unneeded Observer configurations
2016-09-14 11:16:42 +02:00
zmagod
e1d871dcdb
clear undefind from experiment name and refactor sidebar in reports [fixes SCI-448]
2016-09-14 11:11:35 +02:00
Mojca Lorber
a9029e0928
fixes responsiveness on mobile phone for sample view
2016-09-14 11:08:40 +02:00
mz3944
ea898ed3ce
Merge pull request #145 from mz3944/mz_checklists_items_move_and_step/result_comment_fix
...
Fixed step's checklist items editing (items not multiplying and new i…
2016-09-13 19:05:10 +02:00
Matej Zrimšek
76ff34a8a9
URL presigning is now used only when using S3 file uploading (caused error for local uploading) [fixes SCI-447], along with some refactoring.
2016-09-13 18:56:47 +02:00
Mojca Lorber
36378d03e2
fixes links and missing experiment level in search results
2016-09-13 17:13:58 +02:00
zmagod
d5c5c55bf2
refactor
2016-09-13 16:32:33 +02:00
Zmago Devetak
b26bf7b183
Merge pull request #136 from ZmagoD/zd_SCI_370
...
Enabled to delete results in task archive [fixes SCI-370]
2016-09-13 15:22:08 +02:00
zmagod
29a2904513
fixed moving action of workflows and tasks
2016-09-13 14:51:53 +02:00
zmagod
7c363d5ade
fixed security issue
2016-09-13 13:57:31 +02:00
Zmago Devetak
319893bf81
Merge pull request #143 from ZmagoD/zd_SCI_372
...
Set move and clone permissions
2016-09-13 13:37:23 +02:00
zmagod
3d5a42cc27
refactor results controller
2016-09-13 13:26:04 +02:00
zmagod
222ddf7438
fixed houd error
2016-09-13 13:26:04 +02:00
zmagod
691ae94d2c
enabled to delete results in task archive [fixes SCI-370]
2016-09-13 13:26:04 +02:00
zmagod
65383f1824
fixes sidebar expanded elements when adding new experiments [fixes SCI-342]
2016-09-13 13:09:57 +02:00
Pavel Maslov
15ea8fc0dc
Bug fixed: comments in results have no error message if the text exceeds 1000 characters.
2016-09-13 12:01:56 +02:00
Zmago Devetak
d37c7b853b
Merge pull request #140 from ZmagoD/zd_SCI_341
...
adds label to current project in clone experiment modal [fixes SCI-341]
2016-09-13 11:59:01 +02:00
Zmago Devetak
f86c6b954e
Merge pull request #141 from ZmagoD/zd_SCI_340
...
styled dottel line in sidebar [fixes SCI-340]
2016-09-13 11:58:26 +02:00
Jure Grabnar
6519e8dbb1
Add e-notation preprocessing to formulas
...
SCI-350 #close
2016-09-13 09:46:22 +02:00
Jure Grabnar
fa3515d2eb
Add formulas to reports
2016-09-13 09:46:21 +02:00
Jure Grabnar
3b364be70b
Add formulas to steps tables
2016-09-13 09:44:17 +02:00
Jure Grabnar
5c88bdeeae
Add formulas for readonly results tables
2016-09-13 09:44:17 +02:00
Jure Grabnar
e096f936f9
Add formulas to results
2016-09-13 09:44:17 +02:00
Matej Zrimšek
af8ab3e081
Fixed step's checklist items editing (items not multiplying and new item insertion always at bottom) [fixes SCI-427]. Improved step/result comment GUI [SCI-446].
2016-09-12 16:55:46 +02:00
zmagod
1b31f8827d
set experiment description to 255
2016-09-08 14:35:52 +02:00
Zmago Devetak
1368716aa0
Merge pull request #130 from ZmagoD/zd_SCI_348
...
project overview - updating (or creating new) experiment details
2016-09-08 12:49:35 +02:00
mlorb
f4029a04fd
Merge pull request #142 from mlorb/ml_sci_415
...
fixes navbar size when resizing window [SCI-415]
2016-09-08 12:46:36 +02:00
Matej Zrimšek
6eca3661bf
Some JS error refactoring and accordingly updated error rendering when experiment description is too long.
2016-09-08 12:43:31 +02:00
Mojca Lorber
0435011fee
fixes hound
2016-09-08 12:43:30 +02:00
Mojca Lorber
302a777615
fixes button collision
2016-09-08 12:37:06 +02:00
zmagod
faed0500c7
set move and clone permissions to also validate the user on the organizational level [fixes SCI-372]
2016-09-08 09:23:29 +02:00
Mojca Lorber
4c66ca6f80
fixes navbar size when resizing window
2016-09-08 09:17:58 +02:00
Matej Zrimšek
40355dcc97
If file is recognized as office file, it's allowed to be any office file type.
2016-09-07 14:04:11 +02:00
Luka Murn
0c1759c15a
Merge pull request #135 from Ducz0r/lm-sci-397
...
Resize archived experiment panels
2016-09-07 11:14:53 +02:00
mz3944
d3a3dd4428
Merge pull request #138 from mz3944/mz_result_edit_and_name_length_check_fix
...
Fixed result file deletion and result name updating [fixes SCI-409]. …
2016-09-07 11:07:23 +02:00
mz3944
5f446ab1f0
Merge pull request #134 from mz3944/mz_delete_step_file_fix
...
Fixes files deletion when rails worker is running [fixes SCI-411] and…
2016-09-07 11:00:50 +02:00
zmagod
d92597ac30
styled dottel line in sidebar [fixes SCI-340]
2016-09-07 09:01:40 +02:00
zmagod
d482dff2e6
adds label to current project in clone experiment modal [fixes SCI-341]
2016-09-07 08:26:36 +02:00
zmagod
487d3e18f4
fixed moved experiment thumbnail [fixes SCI-410]
2016-09-07 07:55:45 +02:00
Matej Zrimšek
b0ad6d0753
Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407].
2016-09-06 23:26:00 +02:00
zmagod
daa144ce7c
added missing bracket
2016-09-06 11:57:03 +02:00
zmagod
856d226946
fixed move experiment form error duplication
2016-09-06 11:48:56 +02:00
zmagod
a5a24c7610
clear unused variable
2016-09-06 11:46:28 +02:00
zmagod
b672d85405
fixed error message duplication
2016-09-06 11:46:28 +02:00
zmagod
b44a284b54
sets edit experiment validation
2016-09-06 11:46:28 +02:00
zmagod
9d469f9092
sets front end validation for new experiment modal [fixes SCI-348]
2016-09-06 11:44:03 +02:00
zmagod
de6c03a73b
setup experiment modal input validation
2016-09-06 11:44:03 +02:00
Zmago Devetak
9440371f3f
Merge pull request #131 from ZmagoD/zd_SCI_400
...
Sets front end validation for experiment move action [fixes SCI-400]
2016-09-06 11:39:38 +02:00
zmagod
c526cab498
removed commented code
2016-09-06 11:38:02 +02:00
mlorb
f0e28b90a0
Merge pull request #133 from mlorb/ml_sci_415
...
minimize buttons on mobile phone [SCI-415]
2016-09-06 11:26:32 +02:00
Luka Murn
bda5120548
Resize archived experiment panels
...
Closes SCI-397.
2016-09-06 10:55:05 +02:00
Matej Zrimšek
9fb30c7661
Fixes files deletion when rails worker is running [fixes SCI-411] and fixes picture's style files deletion.
2016-09-06 10:40:01 +02:00
Mojca Lorber
47983812e7
minimize buttons on mobile phone
2016-09-06 10:10:49 +02:00
Zmago Devetak
1a19753df9
Merge pull request #128 from ZmagoD/zd_SCI_105
...
Trim long words in reports [fixes SCI-105]
2016-09-06 10:10:06 +02:00
zmagod
a7b6135b2f
cleared console.log
2016-09-06 10:08:32 +02:00
Luka Murn
81883911c4
Merge pull request #132 from Ducz0r/lm-sci-228
...
Updates to invite users to team modal window
2016-09-05 15:53:15 +02:00
mlorb
aea288371f
Merge pull request #129 from mlorb/ml_sci_310
...
adds tasks, experiment and project category in protocol search results [SCI-310]
2016-09-05 15:31:35 +02:00
Luka Murn
1d8600b39f
Fix bug when inviting existing users onto teams
...
Closes SCI-228
2016-09-05 14:52:56 +02:00
mz3944
50e0c26e89
Merge pull request #125 from mz3944/mz_removed_avatar_upload_popop_sci_399
...
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
2016-09-05 11:49:04 +02:00
Mojca Lorber
6a802e9fa7
fixes redirection to project page for all categories in search results
2016-09-05 11:40:49 +02:00
Mojca Lorber
740392c687
optimization
2016-09-05 10:58:37 +02:00
zmagod
667fb67052
sets front end validation for experiment move action [fixes SCI-400]
2016-09-02 16:31:17 +02:00
Zmago Devetak
fb6bc31bec
Merge pull request #127 from ZmagoD/zd_SCI_247_again
...
Table from step stays in report, although it is deleted from step.
2016-09-02 15:59:17 +02:00
Zmago Devetak
ea26a532e4
Merge pull request #126 from ZmagoD/zd_SCI_332
...
By default all experiments should be collapsed
2016-09-02 15:58:03 +02:00
Mojca Lorber
6763d8e7a1
fixes hound again
2016-09-02 11:56:32 +02:00
Mojca Lorber
4bce00ac61
fixes hound
2016-09-02 11:54:20 +02:00
Mojca Lorber
83034f705d
adds tasks, experiment and project category in protocol search results
2016-09-02 11:45:54 +02:00
zmagod
28fa00c30c
trim long words in reports [fixes SCI-105]
2016-09-01 15:45:39 +02:00
zmagod
4afaa50ce0
fixed multiple tables check
2016-09-01 13:49:12 +02:00
zmagod
111cb81d08
clear tables from report [fixes SCI-247] again
2016-09-01 13:38:09 +02:00
Luka Murn
61f4fbd1d4
Remove warning info when removing pending user from organization
2016-09-01 13:23:53 +02:00
zmagod
ac7ac95da8
[fixes SCI-332]
2016-09-01 10:38:20 +02:00
Matej Zrimšek
4fdf478426
Minor refactoring.
2016-08-31 17:57:06 +02:00
Matej Zrimšek
828eebeb16
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
2016-08-31 17:21:17 +02:00
zmagod
55ba2de41f
fixes object duplication
2016-08-31 16:34:08 +02:00
zmagod
fabfa83171
introdutory popup cookie
2016-08-31 15:18:21 +02:00
zmagod
e8f971829a
added project to session storage
2016-08-31 15:13:17 +02:00
Luka Murn
5cb79f6282
Fix the default parameters in JS
...
This was causing major issues in IE.
2016-08-31 14:04:45 +02:00
zmagod
eb394ce209
fixes searching tables bug [fixes SCI-402]
2016-08-31 11:01:10 +02:00
zmagod
b05c3df4d3
adds toggle id only to elements with modules
2016-08-31 10:25:40 +02:00
zmagod
eb39eedfdf
[fixes SCI-398] again
2016-08-31 08:46:51 +02:00
zmagod
21f84bacb6
set sidebar collapsed elements
2016-08-31 08:24:59 +02:00
jbargu
2cd5d85d68
Merge pull request #120 from jbargu/jg_SCI_328_move_experiment_reconnect
...
When moving a task, it should connect the source and destination
2016-08-30 18:01:38 +02:00
mlorb
905acfd43d
Merge pull request #109 from mlorb/ml_sci_286
...
fixes notification when adding new sample [SCI-286]
2016-08-30 17:54:45 +02:00
Mojca Lorber
dd8e5d5e12
fixes hound
2016-08-30 17:12:26 +02:00
Mojca Lorber
1b1e6daa21
fixes notification disappearance and error notifications
2016-08-30 16:55:59 +02:00
Jure Grabnar
9a82e7d72b
Connect tasks on moving
...
SCI-328 #close
2016-08-30 15:57:27 +02:00
mlorb
8fc29248b3
Merge pull request #119 from mlorb/ml_sci_396
...
fixes missing experiment name in side bar [SCI-396]
2016-08-30 15:05:04 +02:00
Zmago Devetak
11b314fa20
Merge pull request #107 from ZmagoD/zd_bug_fix
...
fixes new task button after tutorial ends
2016-08-30 15:04:11 +02:00
Zmago Devetak
375a72db18
Merge pull request #114 from ZmagoD/zd_SCI_294_vol2
...
fixes reports file name [fixes SCI-294]
2016-08-30 14:59:07 +02:00
Zmago Devetak
5b4eb07960
Merge pull request #118 from ZmagoD/zd_SCI_398
...
fixes workflow img bug [fixes SCI-398]
2016-08-30 14:55:33 +02:00
Mojca Lorber
52f228725a
fixes hound
2016-08-30 14:04:47 +02:00
Mojca Lorber
aeda6f77d2
fixes missing experiment name in side bar
2016-08-30 13:51:16 +02:00
zmagod
a947354fb5
fixes update times [fixes SCI-398]
2016-08-30 13:23:48 +02:00
Luka Murn
c6e575bd2a
Merge pull request #115 from Ducz0r/lm-deleting-comments-fix
...
Fix for deleting comments
2016-08-30 13:15:35 +02:00
Luka Murn
2b382fee0f
Merge pull request #113 from Ducz0r/lm-add-first-time-activities
...
Fix first time data generator & fake data generator
2016-08-30 13:07:52 +02:00
Luka Murn
0e0228cb8c
Codestyle fixes
2016-08-30 13:06:49 +02:00
zmagod
95ab35e3d6
cleanup update timestamp
2016-08-30 12:58:52 +02:00
Mojca Lorber
43c3a0bb81
fixes merge again
2016-08-30 12:54:08 +02:00
Mojca Lorber
81f9e59dcd
fixes merge
2016-08-30 12:14:15 +02:00
Mojca Lorber
e8d187b5f6
Merge branch 'ml_sci_395'
...
Conflicts:
app/views/canvas/edit/modal/_move_module.html.erb
app/views/canvas/edit/modal/_move_module_group.html.erb
2016-08-30 11:41:25 +02:00
Luka Murn
77ec5bcff9
Reposition comment dropdowns horizontally if needed
...
Closes SCI-258
2016-08-30 11:39:50 +02:00
zmagod
f356acb882
fixes reports file name [fixes SCI-294]
2016-08-30 11:36:39 +02:00
Zmago Devetak
6878adda46
Merge pull request #112 from ZmagoD/zd_SCI_338_vol2
...
Tutorial
2016-08-30 11:07:51 +02:00
Luka Murn
4ee4c6caba
Remove JS validator from step comments
2016-08-30 11:06:30 +02:00
jbargu
fa357dd54f
Merge pull request #110 from jbargu/jg_SCI_328_move_task_no_experiment
...
Remove move on empty experiments
2016-08-30 11:06:16 +02:00
zmagod
4b6567e488
fixed workflowimg link
2016-08-30 11:03:33 +02:00
zmagod
6f1c4df942
fixed new task button in canvas
2016-08-30 10:48:28 +02:00
Zmago Devetak
e96429409e
Merge pull request #108 from ZmagoD/zd_SCI_247_vol2
...
Fixes step destroing bug and fixes reports [fixes SCI-247]
2016-08-30 09:57:56 +02:00
zmagod
57c1707e81
fixes secondary navigation [fixes SCI-338]
2016-08-30 09:53:56 +02:00
Luka Murn
c86d21d689
Fix bug in organization.rb
...
Bug was related to introduction of experiment level.
2016-08-30 09:46:54 +02:00
Mojca Lorber
a35bf7182f
fixes troubles
2016-08-30 09:43:39 +02:00
Mojca Lorber
596d403d5f
change position of buttons
2016-08-30 09:16:53 +02:00
zmagod
d33bb50519
disabled secondary navigation in samples tutorial
2016-08-30 08:57:05 +02:00
zmagod
5518d1cd1e
fixed 16 step of tutorial
2016-08-30 08:52:44 +02:00
Jure Grabnar
0c184dcdcf
Remove Move button on empty experiments
...
SCI-328 #close.
2016-08-30 08:26:59 +02:00
Luka Murn
30e8e33774
Add comment activities to first time data generator
2016-08-30 08:19:35 +02:00
Mojca Lorber
b07f1af90f
fixes hound again again
2016-08-29 17:08:00 +02:00
Mojca Lorber
7f8bb9be53
fixes hound again
2016-08-29 13:59:51 +02:00
Mojca Lorber
60b0d69a72
fixes hound
2016-08-29 13:56:05 +02:00
Mojca Lorber
53cdbc2638
fixes notification when adding new sample
2016-08-29 13:45:54 +02:00
zmagod
17aacc8ff5
fixes step destroing bug and fixes reports [fixes SCI-247]
2016-08-29 12:04:46 +02:00
zmagod
5af9d10c6a
fixes new task button after tutorial ends
2016-08-29 11:46:45 +02:00
zmagod
2ac20d1af1
adds new image + new panel title [fixes SCI-336]
2016-08-29 09:28:29 +02:00
Luka Murn
a0311970f8
Add missing commits for showing image and not able to preview
2016-08-26 16:49:32 +02:00
zmagod
d886d05ccb
Merge branch 'zd_SCI_338'
2016-08-26 16:32:49 +02:00
Matej Zrimšek
e3a7f45fdf
Merge branch 'master' into mz_file_upload_and_client_side_upgrade
...
Conflicts:
app/assets/javascripts/application.js
app/views/results/_result_asset.html.erb
app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
Zmago Devetak
0cfc758f43
Merge pull request #102 from ZmagoD/zd_SCI_336
...
implement first time popup logic
2016-08-26 09:19:36 +02:00
zmagod
b0bd92e3f4
fixed edit action
2016-08-26 09:17:55 +02:00
zmagod
2031c42920
fixed confirmation text
2016-08-26 09:13:45 +02:00
Matej Zrimšek
782d384e26
Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step).
2016-08-25 22:26:53 +02:00
Matej Zrimšek
04d9163ff6
Paperclip file spoofing corrected/modified.
2016-08-25 18:57:06 +02:00
zmagod
99976722a8
uncomment js file
2016-08-25 18:49:49 +02:00
zmagod
1738ca66d2
one-time introductory popup [fixes SCI-336]
2016-08-25 18:44:21 +02:00
Luka Murn
8018cff02e
Merge pull request #103 from Ducz0r/bb_edit_delete_comments
...
Edit&delete comments
2016-08-25 17:18:48 +02:00
mlorb
b1218cb3d6
Merge pull request #59 from biosistemika/ml_sci_244
...
fixes tutorial bug of inappropriate window [SCI-244]
2016-08-25 17:16:45 +02:00
Luka Murn
b533b0aca6
Fix another minor bug
2016-08-25 17:15:53 +02:00
Luka Murn
7cd94e8b0d
Fix a minor bug on canvas
2016-08-25 17:09:55 +02:00
Luka Murn
9cd99fc532
Display "no comments" if you delete the last comment
2016-08-25 17:01:30 +02:00
Zmago Devetak
1b21e55fea
Merge pull request #100 from ZmagoD/zd_SCI_381
...
Adds experiment and team to tag search resuls [fixes SCI-381]
2016-08-25 15:43:50 +02:00
zmagod
7a47ff6bc5
fixed new task error
2016-08-25 15:30:32 +02:00
zmagod
8ff645fb89
disabled experiment dropdown actions
2016-08-25 15:16:51 +02:00
Zmago Devetak
b090fd8d5b
Merge pull request #95 from ZmagoD/zd_SCI_374
...
adds edit workflow link if no workflow [fixes SCI-374]
2016-08-25 14:07:33 +02:00
Luka Murn
a480c8d403
Styling fixes
2016-08-25 13:59:50 +02:00
Luka Murn
6d86a02d7c
Add individual permission checks in dropdowns
...
Closes SCI-258.
2016-08-25 13:51:50 +02:00
Luka Murn
8592c13ed4
Remove now obsolote controller actions
2016-08-25 13:51:31 +02:00
Luka Murn
b0d7b9dc75
Generate activities when editing/deleting comments
2016-08-25 13:51:31 +02:00
Luka Murn
24dd25d9f5
Add edit/delete result comment functionality
...
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
2016-08-25 13:51:31 +02:00
Luka Murn
bac0455435
Add edit&delete functionality to step comments
...
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
2016-08-25 13:51:31 +02:00
Luka Murn
512efd3812
Fix 2 lines that were too long
2016-08-25 13:51:31 +02:00
Luka Murn
c92d016f65
Add edit&delete module/task comments functionality
...
This required a minor fix of comments.js.
2016-08-25 13:51:31 +02:00
Luka Murn
f0d9cb96fa
Add edit project comments functionality
2016-08-25 13:51:30 +02:00
Luka Murn
15c0baeee8
Add delete project comment functionality
...
This commit also removes the old code from @bberic.
2016-08-25 13:51:30 +02:00
Luka Murn
9e3bb8edb7
Add dependant: :destroy to comments
2016-08-25 13:51:30 +02:00
Luka Murn
8a73a3ab5c
Update permission_helper.rb and routes.rb
2016-08-25 13:51:30 +02:00
Luka Murn
319bcc7850
Add permissions for comments to permission_helper.rb
2016-08-25 13:51:30 +02:00
Luka Murn
5569a1e6d2
Revert 2 files that contained no changes
2016-08-25 13:51:30 +02:00
scibb
a76d82d188
delete and edit comments for projects, protocols, results, and workflow elements
2016-08-25 13:51:30 +02:00
zmagod
5fabe06b8d
implement first time popup logic
2016-08-25 11:44:49 +02:00
Mojca Lorber
4a5d720724
change position of overview and samples
2016-08-25 11:19:53 +02:00
zmagod
1120ef1407
adds experiment and team to tag search resuls [fixes SCI-381]
2016-08-25 10:40:03 +02:00
mlorb
c38a4e2614
Merge pull request #94 from mlorb/ml_sci_375
...
add move experiment instructions [SCI-375]
2016-08-25 09:45:16 +02:00
Luka Murn
c082bceafc
Merge pull request #98 from Ducz0r/lm-sci-385
...
Fix bug with linked tasks
2016-08-25 09:29:50 +02:00
zmagod
f515366d91
fixes workflowing after updating description, fixes canvas bug
2016-08-25 09:11:42 +02:00
mlorb
0a066f436f
Merge pull request #96 from mlorb/ml_sci_369
...
buttons update on experiment overview [SCI-369]
2016-08-25 08:54:16 +02:00
zmagod
92bb3dda99
hide last next button
2016-08-25 08:46:11 +02:00
zmagod
dbdbff12eb
add experiment level tutorial step [fixes SCI-338]
2016-08-24 19:03:58 +02:00
Luka Murn
3dddffaa34
Fix bug with linked tasks
...
This bug was a legacy of experiment level introduction.
Closes SCI-385, SCI-366.
2016-08-24 17:22:16 +02:00
mlorb
2d90ad1a65
Merge pull request #88 from mlorb/ml_sci_362
...
fixes tile size in edit canvas [SCI-362]
2016-08-24 17:07:11 +02:00
Mojca Lorber
2a897432e1
update buttons on canvas view
2016-08-24 17:00:27 +02:00
jbargu
5c104ac050
Merge pull request #93 from jbargu/jg_sci_378_move_experiment_error
...
Fix 404 move experiment error
2016-08-24 16:35:29 +02:00
Mojca Lorber
d04df349d5
fixes medium and small zoom
2016-08-24 14:18:12 +02:00
Zmago Devetak
0de7ea31ea
Merge pull request #90 from ZmagoD/zd_SCI_376
...
fixes cloned experiment protocol [fixes SCI-376]
2016-08-24 14:12:19 +02:00
zmagod
9393a96302
adds edit workflow link if no workflow [fixes SCI-374]
2016-08-24 14:10:50 +02:00
Mojca Lorber
0558d49e26
buttons update on experiment overview
2016-08-24 13:50:25 +02:00
Jure Grabnar
00da7efb44
Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows'
...
Conflicts:
app/models/experiment.rb
SCI-328 #close
2016-08-24 13:11:10 +02:00
Zmago Devetak
afaeab492d
Merge pull request #87 from ZmagoD/zd_SCI_371
...
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
2016-08-24 11:56:29 +02:00
jbargu
180efac87b
Merge pull request #92 from jbargu/jg_exp_overview_navbar_sci_353
...
Show whole tree structure for experiment in sidebar
2016-08-24 11:50:39 +02:00
Jure Grabnar
dff5abf3d9
Fix module moving position not being updated
2016-08-24 11:42:21 +02:00
Mojca Lorber
f554dc6018
add move experiment instructions
2016-08-24 11:36:50 +02:00
Jure Grabnar
3e5e9aed22
Fix 404 on move experiment
...
[fixes SCI-378]
2016-08-24 11:09:03 +02:00
zmagod
27d77bc73f
added new permission for dropdown actions
2016-08-24 10:56:30 +02:00
Jure Grabnar
e60533af57
Add whole tree structure for experiment
...
SCI-353 #close
2016-08-24 10:47:30 +02:00
Jure Grabnar
a091571d9c
Add consistent links for archive for all entities
2016-08-24 09:14:29 +02:00
Jure Grabnar
0cdb18ffcd
Update experiment links on sidebar between actions
2016-08-24 09:05:57 +02:00
Jure Grabnar
a41d851830
Fix secondary navigation for experiment level (overview)
2016-08-24 08:54:02 +02:00
mlorb
5c8d669cac
Merge pull request #81 from mlorb/ml_sci_364
...
fixes edit experiment [SCI-364]
2016-08-23 16:49:20 +02:00
Zmago Devetak
396325bd67
Merge pull request #86 from ZmagoD/zd_SCI_365
...
changed experiment create redirection [fixes SCI-365]
2016-08-23 16:30:48 +02:00
Zmago Devetak
9dc7708b73
Merge pull request #85 from ZmagoD/zd_SCI_360
...
fixes project overview style and add no description link [fixes SCI-360]
2016-08-23 16:24:22 +02:00
Zmago Devetak
d67997fa8b
Merge pull request #83 from ZmagoD/zd_SCI_347
...
Fixes search result link for experiment [fixes SCI-347]
2016-08-23 16:23:41 +02:00
Zmago Devetak
aa650bbc65
Merge pull request #82 from ZmagoD/zd_SCI_359
...
Add plus button at the bottom of project overview page [fixes SCI-359]
2016-08-23 16:23:20 +02:00
Zmago Devetak
7e2db66f42
Merge pull request #79 from ZmagoD/zd_SCI_345
...
Adds font-awesome to pdf [fixes SCI-345]
2016-08-23 16:22:30 +02:00
Zmago Devetak
65049692ea
Merge pull request #78 from ZmagoD/zd_SCI_349
...
updating thumbnail
2016-08-23 16:22:07 +02:00
zmagod
0429816154
deleted commented code
2016-08-23 16:21:11 +02:00
zmagod
2bbb439745
fixes cloned experiment protocol [fixes SCI-376]
2016-08-23 16:15:45 +02:00
Mojca Lorber
126cf0c210
fixes drag connections area
2016-08-23 16:08:05 +02:00
Mojca Lorber
322be64b5f
change experiment path
2016-08-23 14:44:22 +02:00
Mojca Lorber
86ed4c18d8
fixes hound
2016-08-23 13:51:20 +02:00
Mojca Lorber
ac68db97b9
fixes tile size in edit canvas
2016-08-23 13:33:10 +02:00
Jure Grabnar
67768c8865
Fix Hound errors
2016-08-23 11:08:10 +02:00
Jure Grabnar
0d56cea3e4
Add placeholders for empty experiments
2016-08-23 10:37:48 +02:00
Jure Grabnar
027193f937
Add links for moving module groups
2016-08-23 10:09:25 +02:00
Jure Grabnar
358f2b1c47
Add moving for newly created modules
2016-08-23 10:00:34 +02:00
zmagod
f918746946
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
2016-08-23 09:26:52 +02:00
zmagod
66b8a3055d
changed experiment create redirection [fixes SCI-365]
2016-08-23 09:03:39 +02:00
Jure Grabnar
c0edf51054
Fix bounding box algorithm, can move new modules
2016-08-23 09:00:25 +02:00
zmagod
03a3759cf5
fixes project overview style and add no description link [fixes SCI-360]
2016-08-23 08:52:53 +02:00
Jure Grabnar
8940ba891b
Add initial position for moving workflows
2016-08-22 17:52:55 +02:00
Jure Grabnar
667b7671a6
Add connections for moved workflows
2016-08-22 17:26:21 +02:00
zmagod
9a05935067
fixed search result link for experiment [fixes SCI-347]
2016-08-22 15:35:47 +02:00
Mojca Lorber
75c52d20e5
fixes hound
2016-08-22 15:30:27 +02:00
zmagod
8c592753e4
fixes hound
2016-08-22 15:27:11 +02:00
zmagod
bb11999566
adds plus button at the bottom of project overview page [fixes SCI-359]
2016-08-22 15:22:05 +02:00
Mojca Lorber
131d0d269a
fixes edit experiment
2016-08-22 15:18:02 +02:00
zmagod
eab05eb9db
adds font-awesome to pdf [fixes SCI-345]
2016-08-22 14:40:09 +02:00
zmagod
d38f29d207
set ajax loading of experiments images [fixes SCI-349]
2016-08-22 11:29:19 +02:00
mlorb
ed1cd193ac
Merge pull request #77 from mlorb/ml_sci_357
...
fixes warning messages when loading a new protocol that is linked with repository [SCI-357]
2016-08-22 08:56:36 +02:00
mlorb
0832466d20
Merge pull request #76 from mlorb/ml_sci_286
...
fixes notifications when creating new sample type or group [SCI-286]
2016-08-22 08:54:28 +02:00
Mojca Lorber
1c220aba7b
delete comment
2016-08-22 08:50:48 +02:00
Jure Grabnar
5bb99adb25
Add frontend logic for moving workflows from canvas
2016-08-19 17:11:17 +02:00
zmagod
b86e67a0d6
refactor initProjectExperiment
2016-08-19 16:38:34 +02:00
Mojca Lorber
fb081be682
fixes warning messages when loading a new protocol that is linked with repository
2016-08-19 16:03:10 +02:00
zmagod
cac5033eba
set ajax for workflow img
2016-08-19 15:36:12 +02:00
Zmago Devetak
99aa66cd84
Merge pull request #74 from ZmagoD/zd_SCI_346
...
check search input string [fixes SCI-346]
2016-08-19 14:01:56 +02:00
Mojca Lorber
799cac1238
fixes hound
2016-08-19 13:55:34 +02:00
Jure Grabnar
80498260e5
Add backend for moving task from canvas
2016-08-19 13:53:43 +02:00
Jure Grabnar
f575303d11
Update get_new_position for new canvas size
...
SCI-358 #close
2016-08-19 13:42:28 +02:00
Mojca Lorber
51e0d53b12
remove code duplication
2016-08-19 13:08:35 +02:00
Mojca Lorber
571f5b60f3
fixes notifications appearance and disappearance and content adjustment
2016-08-19 10:48:43 +02:00
Mojca Lorber
5c77167388
update buttons
2016-08-18 16:47:16 +02:00
Mojca Lorber
5695842fe3
fixes notifications when creating sample types and groups
2016-08-18 16:05:15 +02:00
Zmago Devetak
58930f3456
Merge pull request #73 from ZmagoD/zd_SCI_344
...
fixes user duplication [fixes SCI-344]
2016-08-18 13:28:59 +02:00
zmagod
2216a86db5
hound again
2016-08-18 13:27:46 +02:00
zmagod
d3f61bdd18
fixes hound alert
2016-08-18 13:24:44 +02:00
Zmago Devetak
a680b09cc9
Merge pull request #72 from ZmagoD/zd_fix_exl_archive
...
fixed experiments archive bug
2016-08-18 13:16:51 +02:00
Zmago Devetak
fe626a8cb3
Merge pull request #71 from ZmagoD/zd_SCI_294
...
Zd sci 294
2016-08-18 13:16:38 +02:00
zmagod
d62500cb56
check search input string [fixes SCI-346]
2016-08-18 13:14:31 +02:00
zmagod
4b5be7530c
fixed task archive
2016-08-18 11:53:57 +02:00
zmagod
da2b9ccf82
fixes user duplication [fixes SCI-344]
2016-08-18 11:26:52 +02:00
zmagod
fa08b861d0
fixed experiments archive bug
2016-08-18 10:55:29 +02:00
Jure Grabnar
6879521a75
Add missing .experiment to can_unlink_protocol
2016-08-18 10:48:44 +02:00
zmagod
6bb8d075e0
truncate asset name in task step and result [fixes SCI-294]
2016-08-18 09:22:12 +02:00
zmagod
072f816286
refactor restore_after_tutorial function
2016-08-18 08:55:40 +02:00
zmagod
f2ee5d73a0
fixed project tutorial bug
2016-08-18 08:53:34 +02:00
Zmago Devetak
b6ccecf478
Merge pull request #69 from ZmagoD/zd_SCI_335
...
cleans experiment form report if moved [fixes SCI-335]
2016-08-18 08:37:09 +02:00
Jure Grabnar
c3074e91de
Fix activity in first time generator
2016-08-18 08:33:08 +02:00
mlorb
36d24523b4
Merge pull request #61 from biosistemika/ml_sci_291
...
fixes dissapearance of sample type/group when editing samlpe or adding new sample [SCI-291]
2016-08-18 08:25:31 +02:00
Zmago Devetak
4897e2da0c
Merge pull request #68 from ZmagoD/zd_SCI_330
...
Zd sci 330
2016-08-18 08:10:20 +02:00
Zmago Devetak
f2e08db106
Merge pull request #67 from ZmagoD/zd_SCI_337
...
Zd sci 337
2016-08-18 08:06:38 +02:00
Zmago Devetak
d17af4e898
Merge pull request #66 from ZmagoD/zd_SCI_331
...
adds active class to experiment name in sidebar [fixes SCI-331]
2016-08-18 08:06:03 +02:00
Matej Zrimšek
4ad384df5a
Fixed hound alerts.
2016-08-17 21:02:05 +02:00
Matej Zrimšek
27a9dac412
File permissions corrected, with some refactoring.
2016-08-17 18:23:24 +02:00
Matej Zrimšek
e4a6a3944e
Added deleting of files on S3 server when editing/removing a file. Some refactoring.
2016-08-17 18:13:35 +02:00
Matej Zrimšek
ccdccc5cf1
Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.
2016-08-17 18:11:13 +02:00
Matej Zrimšek
854ef0d227
Special characters caused error [fixes SCI-315].
2016-08-17 18:10:47 +02:00
Matej Zrimšek
c87ba5b45c
Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.
2016-08-17 18:10:32 +02:00
Matej Zrimšek
951cf67b3d
A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.
2016-08-17 18:08:21 +02:00
Matej Zrimšek
b70f49f4e0
Some additional refinements.
2016-08-17 18:00:04 +02:00
Matej Zrimšek
86880f0299
Additional changes, refactoring and improvements.
2016-08-17 17:57:54 +02:00
Matej Zrimšek
01aad1764c
Some hotfixes to previous commit. Client-side file validation added (except file type validation). Some refactoring.
2016-08-17 17:54:45 +02:00
Matej Zrimšek
e2f94caa96
Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done.
2016-08-17 17:54:06 +02:00
Jure Grabnar
78cf4f396e
render_403 and 404 now return true
...
To prevent any: render_403 and return type of bugs
2016-08-17 15:46:30 +02:00
Jure Grabnar
77f75fdeb6
Delete module from canvas when moving
2016-08-17 15:46:30 +02:00
Jure Grabnar
0cdea0b51a
Add modal for moving task on canvas
2016-08-17 15:46:30 +02:00
zmagod
c27c6c19e5
cleans experiment form report if moved [fixes SCI-335]
2016-08-17 15:21:53 +02:00
zmagod
9fd68c7bd5
fixes 'new experiment' button bug on smaller screens
2016-08-17 14:27:59 +02:00
zmagod
ca0ba1403d
set flask icon to experiment [fixes SCI-330]
2016-08-17 14:17:29 +02:00
zmagod
cc2ed32ccb
fixes canvas bug when no actions are available for the viewer
2016-08-17 13:29:22 +02:00
zmagod
6c5cc8aac9
fixes notification [fixes SCI-337]
2016-08-17 13:17:40 +02:00
zmagod
8d69ca0b88
adds active class to experiment name in sidebar [fixes SCI-331]
2016-08-17 11:21:48 +02:00
zmagod
d557f3249f
Adds single tasks to the experiment img [fixes SCI-329]
2016-08-17 11:13:49 +02:00
Zmago Devetak
da735a51f4
Merge pull request #62 from ZmagoD/zd_SCI_318
...
Zd sci 318
2016-08-17 10:01:10 +02:00
Zmago Devetak
13697e8688
Merge pull request #58 from ZmagoD/zd_SCI_74
...
Filter search query for special chars [fixes SCI_74]
2016-08-17 10:00:47 +02:00
zmagod
4293f9c267
Merge branch 'zd_SCI_271' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_271
2016-08-17 09:58:29 +02:00
zmagod
850f5d8dad
fixing hound alerts
2016-08-17 09:44:23 +02:00
zmagod
7abc8f3a90
Merge branch 'master' into experiment-level
2016-08-17 09:28:35 +02:00
zmagod
76dd4bc90a
fixed protocol status bar [fixes SCI-318]
2016-08-16 10:47:23 +02:00
Zmago Devetak
762b805651
Merge pull request #55 from ZmagoD/zd_papperclip_migration_bug
...
fixes migration error
2016-08-16 10:44:53 +02:00
Zmago Devetak
9b97dad03d
Merge pull request #54 from ZmagoD/zd_SCI_39
...
fixes loading samples error in blank project
2016-08-16 10:44:35 +02:00
Jure Grabnar
275106c27c
Add check for empty projects on move experiments
2016-08-16 10:20:36 +02:00
Mojca Lorber
7dc0c3672a
fixes dissapearance of sample type/group when adding/editing new sample
2016-08-16 10:17:29 +02:00
Jure Grabnar
c16eed5e63
Add missing dropdown_actions.js
2016-08-16 09:48:19 +02:00
zmagod
5e647f62d5
changed import label [fixes SCI-317]
2016-08-16 09:34:04 +02:00
Jure Grabnar
a29b56b0bd
Even more candy for our dog
2016-08-16 09:15:29 +02:00
Jure Grabnar
b25a7758db
Give a candy to our special dog
2016-08-16 09:10:45 +02:00
Jure Grabnar
042a33f2c7
Add activity for moving
2016-08-16 08:49:24 +02:00
Jure Grabnar
e55c66b3d0
Add query for moveable projects
2016-08-16 08:47:04 +02:00
zmagod
852fe499fb
clean up linked protocol
2016-08-12 16:31:40 +02:00
Jure Grabnar
c387439fb2
Fix projects query for experiments
...
Remove unneeded word in view
2016-08-12 11:36:52 +02:00
Mojca Lorber
e6f205368b
fixes tutorial bug of inappropriate window
2016-08-12 11:33:27 +02:00
Jure Grabnar
d7341d0383
Set actions/routes/view for move experiment
2016-08-12 11:26:18 +02:00
zmagod
c9ff249067
fixed hound alert
2016-08-12 11:11:52 +02:00
zmagod
6c7cfb4467
filter search query for special chars [fixes SCI_74]
2016-08-12 11:08:51 +02:00
Jure Grabnar
555ed05ae6
Refactor/DRY dropdown actions code for experiment
2016-08-12 10:18:35 +02:00
mlorb
6b17385f3a
Merge pull request #56 from biosistemika/ml_sci_302
...
fixes problem with split table when generating pdf report [SCI-302]
2016-08-12 08:55:10 +02:00
mlorb
f3163ea7ce
visual corrections
2016-08-12 08:54:14 +02:00
Jure Grabnar
9173c83502
Select current project in clone modal
2016-08-11 17:20:06 +02:00
Jure Grabnar
3c36293770
Add activity for cloning experiment
2016-08-11 17:00:33 +02:00
Jure Grabnar
5c40d04eb2
Add missing clone modal
2016-08-11 16:59:56 +02:00
Jure Grabnar
2f6ccac3bc
Add unique experiment name and copy image when cloning
2016-08-11 16:58:31 +02:00
Jure Grabnar
6e8e9ecf21
Fix activities and the dreaded no project for modules error
2016-08-11 16:57:29 +02:00
zmagod
d1f6a0f58d
fixed hound
2016-08-11 16:24:44 +02:00
zmagod
701c26a2dd
fixed canvas edit and samples tutorial [fixes: SCI-271]
2016-08-11 16:21:55 +02:00
zmagod
a128815122
fixed tutorial tasks on canvas
2016-08-11 16:06:51 +02:00
Mojca Lorber
94915a9ba7
fixes problem with splitted table when generating pdf report [SCI-302]
2016-08-11 15:24:18 +02:00
Jure Grabnar
3b259d34b0
Basic cloning of experiment works
...
Still missing:
- cloning of assets
- cloning of experiment image
2016-08-11 15:13:36 +02:00
zmagod
2e1d81a985
fixed project archive in tutorial
2016-08-11 12:40:16 +02:00
Mojca Lorber
b350dff826
fixes problem with splitted table when generating pdf report [SCI-302]
2016-08-11 10:42:36 +02:00
Jure Grabnar
7f21ae138a
Set clone actions/routes/view
...
DRY code for showing AJAX on project#show page
2016-08-11 09:46:15 +02:00
scibb
32699578ed
Merge pull request #52 from biosistemika/bb_canvas_fixes
...
Bb canvas fixes
2016-08-11 09:29:21 +02:00
zmagod
060da59bbb
fixes migration error
2016-08-11 09:19:12 +02:00
Jure Grabnar
1ca34a7986
Fix result texts/tables
2016-08-10 15:44:33 +02:00
Jure Grabnar
52e6d7d300
Fix step comments
2016-08-10 15:44:33 +02:00
Jure Grabnar
3e72f29bfd
Fix uploading of step assets
2016-08-10 15:44:33 +02:00
Jure Grabnar
d69195a4f6
Fix uploading of result assets
2016-08-10 15:44:33 +02:00
zmagod
c866e90b33
Merge branch 'zd_add_image_to_project_preview' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_add_image_to_project_preview
2016-08-10 11:33:37 +02:00
zmagod
7653f2b9ec
fixed hound
2016-08-10 11:26:27 +02:00
Jure Grabnar
b2855d69f6
Fix hound warning
2016-08-10 09:24:06 +02:00
zmagod
deb739efa6
fixes loading samples error in blank project
2016-08-10 09:13:12 +02:00
Jure Grabnar
15d66c7884
Change validation for experiment workimg
2016-08-10 08:58:29 +02:00
Jure Grabnar
7b0f323576
Add expiring URL to experiment img
2016-08-09 16:37:44 +02:00
zmagod
f77e0d4a6e
changed workflow image name
2016-08-09 16:27:28 +02:00
zmagod
5583105d8a
fixed hound alert
2016-08-09 14:28:55 +02:00
zmagod
5f3a5cb845
fixed project overview
2016-08-09 14:26:08 +02:00
Jure Grabnar
e995165876
Double quotes -> single quotes (#hound)
2016-08-09 13:19:32 +02:00
Jure Grabnar
9f7df0af76
Fix checkbox in experiment reports
2016-08-09 13:13:50 +02:00
zmagod
176aad4c6d
fixes multiple graphs rendering
2016-08-09 11:19:07 +02:00
Jure Grabnar
208e85e7e0
Remove archived experiments from reports
2016-08-09 11:17:25 +02:00
Jure Grabnar
1a7a7a1d1a
Add info to experiment archive cards
...
Also add addtional check for due date on archive experiment
2016-08-09 11:04:46 +02:00
Jure Grabnar
a0fe31479f
Fix permissions for archived experiments
2016-08-09 10:00:44 +02:00
Jure Grabnar
0ca5725f9b
Archive/restore of experiments now work
2016-08-08 16:35:45 +02:00
zmagod
1a56396eb5
add workflow image to project overview page [fixes SCI-41]
2016-08-08 16:02:17 +02:00
scibb
696075bf0f
smaller grid steps set. In addition enddpoint bug was fixed
...
SCI 170, SCI 292'
2016-08-08 15:18:38 +02:00
Jure Grabnar
5c858ee577
Add missing experiment archive page
2016-08-08 15:04:38 +02:00
Jure Grabnar
2bd74866e0
Fix my_modules archive page
2016-08-08 15:04:02 +02:00
Jure Grabnar
5a023483d7
Prepare views for experiment archive
2016-08-08 14:19:35 +02:00
Jure Grabnar
775a39344c
Fix experiment archive permissions
2016-08-08 13:40:08 +02:00
Jure Grabnar
deecbf082c
Remove badly merged code
2016-08-08 13:06:20 +02:00
Zmago Devetak
4bd489d29c
Merge pull request #46 from ZmagoD/zd_SCI_303
...
update sidebar v2 [fixes SCI-303]
2016-08-08 08:56:01 +02:00
jbargu
3f91e7a476
Merge pull request #47 from biosistemika/jg_explvl_reports
...
Update reports with experiment level
[Fixes SCI-35].
2016-08-08 08:51:23 +02:00
zmagod
520cf2e0cf
hound....
2016-08-08 08:40:24 +02:00
zmagod
e16abe486c
fix hound alert
2016-08-08 08:37:22 +02:00
zmagod
756c3c777e
styled workflow dots
2016-08-08 08:33:18 +02:00
zmagod
04d171997e
Merge branch 'zd_SCI_41' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_41
2016-08-05 15:56:21 +02:00
zmagod
9c5c4f0a3a
Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44
2016-08-05 15:23:01 +02:00
Mojca Lorber
c691ca63e2
fixing houndci-bot comment
2016-08-05 09:47:06 +02:00
Mojca Lorber
5d137324bc
moving and targeting .label class
2016-08-05 09:12:17 +02:00
Jure Grabnar
d9702b6964
Remove unneeded new element
2016-08-05 08:36:06 +02:00
Jure Grabnar
2f0dc57ea6
Fix Hounds warning
2016-08-05 08:29:49 +02:00
Jure Grabnar
a25a4354c6
Fix css, #hound.
2016-08-05 08:05:14 +02:00
Jure Grabnar
cafec6a1b4
Fix controls on experiment contents
...
Also fix bug with adjencent elements not updating controls.
Fixes SCI-35.
2016-08-04 16:05:03 +02:00
Jure Grabnar
8b2b134614
Migrate old reports to new experiment level reports
2016-08-04 13:19:46 +02:00
zmagod
a4ec558596
start to implement project overview page
2016-08-04 12:57:33 +02:00
zmagod
f8f87e9540
Feed the Hound
2016-08-03 16:16:09 +02:00
zmagod
45dac782ca
update sidebar [fixes SCI-303]
2016-08-03 16:09:45 +02:00
Jure Grabnar
da2a06c999
Fix global sort to work with experiments
2016-08-03 14:59:53 +02:00
zmagod
fd8187370e
Feed the Hound part 3
2016-08-03 13:16:51 +02:00
Jure Grabnar
0c51f7bc8b
Saving/editing of reports now works
2016-08-03 13:15:40 +02:00
zmagod
9d4a67a5b6
Feed the Hound 2
2016-08-03 13:11:46 +02:00
zmagod
57ac34e9f4
add samples to experiment page [fixes SCI-43]
2016-08-03 12:57:51 +02:00
Jure Grabnar
964b51f84a
Add experiment reports element
2016-08-03 12:52:52 +02:00
Jure Grabnar
aedaf2f30a
Adding of experiment content now works in reports
2016-08-03 12:52:52 +02:00
Jure Grabnar
5854e72878
Add experiments_contents action
2016-08-03 12:52:52 +02:00
Jure Grabnar
9092dd6914
Replace all occurences of module_elements
2016-08-03 12:52:52 +02:00
Jure Grabnar
ff081cd844
Simplify project contents dialog
2016-08-03 12:52:51 +02:00
Jure Grabnar
dc82830a8f
Add checkbox behaviour to experiment contents
2016-08-03 12:52:51 +02:00
Jure Grabnar
3f33ebe59a
Fix wrong closure in experiment contents
2016-08-03 12:52:51 +02:00
Jure Grabnar
acc41dae40
Add experiment content report dialog
...
Adding still has to be implemented
2016-08-03 12:52:51 +02:00
Jure Grabnar
41e8c54aa5
Rename _module_element_controls to element_controls
2016-08-03 12:52:06 +02:00
Jure Grabnar
1e334d9075
Remove unneeded "Add new report element"
2016-08-03 12:52:06 +02:00
Jure Grabnar
d82ba163ed
Add experiment to report screen
...
Only placeholder for now, JS still needs fixing.
2016-08-03 12:52:06 +02:00
Jure Grabnar
ac708e7497
Remove no module group from reports
2016-08-03 12:52:06 +02:00
Jure Grabnar
797685fbf0
Remove workflows from project content dialog (report)
2016-08-03 12:52:06 +02:00
Jure Grabnar
daca739262
Add new line to selector for readability
2016-08-03 12:52:06 +02:00
Jure Grabnar
598c5a63fd
Add experiment level to project report contents modal
2016-08-03 12:52:05 +02:00
zmagod
d11b0b11e9
Feed the Hound
2016-08-03 09:44:05 +02:00
zmagod
caa80642c0
[fixes SCI-304], [fixes SCI-37]
2016-08-03 09:34:10 +02:00
Mojca Lorber
ffa64445df
fixes issue SCI-223
2016-08-02 16:30:07 +02:00
Zmago Devetak
43230384b5
Merge pull request #40 from ZmagoD/zd_SCI_261
...
Fixed search query [fixes SCI-261]
2016-08-02 11:44:00 +02:00
zmagod
18d73467c8
fixed hound warning
2016-08-02 11:16:07 +02:00
zmagod
166f907780
fixed search error
2016-08-02 11:10:30 +02:00
zmagod
f184ee3f2d
fixing hound warnings
2016-08-02 09:13:30 +02:00
zmagod
9581e2751f
fixes samples page for experiment level [fixes SCI-44]
2016-08-02 08:44:07 +02:00
zmagod
6e3ce92348
add checking for step content
2016-08-01 11:23:22 +02:00
Luka Murn
40fe4e54a9
Feed the Hound #2
2016-07-29 16:48:56 +02:00
Luka Murn
ecf5b5a2c1
Feed the Hound
2016-07-29 16:46:25 +02:00
Luka Murn
4d57479cf9
Remove comment
...
Closes SCI-38.
2016-07-29 16:40:42 +02:00
zmagod
95da62adde
fixed hound
2016-07-29 16:38:42 +02:00
zmagod
25b99b6570
fixed search [fixes SCI-261]
2016-07-29 16:32:54 +02:00
Luka Murn
8a2b54819a
More fixes on secondary navigation
2016-07-29 16:20:35 +02:00
Luka Murn
bed8687dbd
Remove some unused commented code
2016-07-29 16:08:30 +02:00
Luka Murn
b085aa1db3
Remove uneccesary project_activities HTML pages
2016-07-29 16:06:35 +02:00
Luka Murn
ed2226c14b
Refactor sidebar
2016-07-29 15:58:47 +02:00
Luka Murn
34af50a9d0
Fix breadcrumbs & sidebar so it works
2016-07-29 15:47:41 +02:00
Luka Murn
0f0689eddc
Fix permission helper
2016-07-29 11:43:15 +02:00
Luka Murn
4ea86d6aa1
Code style fixes
2016-07-29 10:41:08 +02:00
Luka Murn
edafcaeed6
Move route module_archive_project -> module_archive_experiment
...
Also add some new routes, move some templates.
2016-07-29 10:25:02 +02:00
Luka Murn
ebda92ef05
Add experiments_controller
2016-07-29 10:21:21 +02:00
Luka Murn
1ad265835b
Move route canvas_project -> canvas_experiment
2016-07-29 10:08:28 +02:00
Luka Murn
0c75423cc0
Add TODO to project overview page
2016-07-29 09:46:26 +02:00
Luka Murn
b64e200b91
Refactor canvas a lot.
...
Also refactor localization files concerning canvas.
2016-07-28 16:41:10 +02:00
Luka Murn
c8ef3b1899
Fix first time generator
2016-07-28 16:40:51 +02:00
zmagod
e95f518964
refactor canvas_controller, experiments_controller
2016-07-28 16:01:53 +02:00
zmagod
d91aa5c60b
fixed translation sting 'name' to 'experiment'
2016-07-28 14:57:47 +02:00
zmagod
23a46d5fb3
added translations to experiment create and edit flash messages
2016-07-28 14:52:11 +02:00
zmagod
352944fc33
added new/edit experiment modals
2016-07-28 14:44:44 +02:00
Luka Murn
1953e295b6
Hotfix for search results bug
2016-07-28 13:29:26 +02:00
zmagod
9d23cfd940
fixed experiment routes
2016-07-28 11:30:34 +02:00
zmagod
c11932b45b
fixed layout
2016-07-28 11:00:56 +02:00
zmagod
d16c0fe706
fixed edit canvas
2016-07-28 10:09:05 +02:00
zmagod
54c4051906
added canvas under experiments
2016-07-28 09:01:44 +02:00
zmagod
a17106b883
added experiments controller and fixed sidebar
2016-07-27 16:18:26 +02:00
Zmago Devetak
c869db2506
Merge pull request #35 from ZmagoD/zd_SCI_40
...
Edit canvas controller to work with experiments
2016-07-27 12:11:19 +02:00
zmagod
485d93f8b9
refactor canvas permissions
2016-07-27 11:35:07 +02:00
Jure Grabnar
1a1c4bb68a
Remove needless join from MyModuleGroup
2016-07-27 10:18:57 +02:00
zmagod
5c7501a273
added experiments canvas labels in localization file and fixed canvas views
2016-07-26 14:21:59 +02:00
zmagod
0a84ecdfc1
edit canvas controller to work with experiment
2016-07-26 14:02:06 +02:00
Jure Grabnar
77ed1c5fd3
Change invalid references to project in search and shorten lines.
2016-07-26 12:59:37 +02:00
Jure Grabnar
80621c9b6b
Add experiment text to all searches related to experiment
2016-07-26 12:26:48 +02:00
Jure Grabnar
690ad0fffa
Add a few experiment permissions
2016-07-26 12:26:48 +02:00
Jure Grabnar
3be562bdf6
Add experiment to search results
2016-07-26 12:26:48 +02:00
Jure Grabnar
6d26203796
Add missing target var to result searches
2016-07-26 12:26:48 +02:00
Jure Grabnar
5283027da1
Add missing target var to searches.
2016-07-26 12:26:48 +02:00
Jure Grabnar
0361f006ca
Add SearchableModel to Experiment and fix children
2016-07-26 12:26:48 +02:00
Jure Grabnar
49cd8a783d
Update first time data generator with experiment.
2016-07-26 12:20:31 +02:00
Zmago Devetak
b13747291e
Merge pull request #32 from ZmagoD/zd_SCI_31
...
Fixing modules after integrating experiment-level
2016-07-26 09:18:16 +02:00
zmagod
346bffe08f
fixed protocol.rb
2016-07-26 09:17:24 +02:00
zmagod
c27ffa9fbf
fixed project_my_module method
2016-07-26 08:44:09 +02:00
Luka Murn
3187843d14
Change updated_by -> last_modified_by
2016-07-25 14:47:13 +02:00
zmagod
6053c782f9
fixed permission_helper [fixes SCI-34]
2016-07-25 12:07:10 +02:00
zmagod
18d66ece56
migrated model related functions to experiment.rb [fixes: SCI-31]
2016-07-25 11:25:10 +02:00
zmagod
426bce48b2
fixed permission_helper
2016-07-25 09:31:40 +02:00
zmagod
b3c61cfa41
fixed project_my_modules method
2016-07-25 09:13:04 +02:00
zmagod
7c9a0bc2bb
fixed models
2016-07-22 15:36:48 +02:00
zmagod
389ee7ea43
start fixing modules
2016-07-22 14:31:09 +02:00
Luka Murn
785fb2cba1
Initial migration & changes in ActiveRecords
2016-07-22 10:43:55 +02:00
Luka Murn
076b67620f
Migration GitLab -> GitHub
2016-07-21 13:11:15 +02:00
Luka Murn
055298fee8
Initial commit.
2016-02-12 16:52:43 +01:00