Zanz2
175aa16a7d
Made submit form on preview, need to route it propperly, made text scroller for step importing that only works with my own sample protocol i created on protocols.io with every attribute set, trying to debug why it does this
2017-09-14 15:52:44 +02:00
Zanz2
5d6cc341ed
added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done
2017-09-14 14:42:04 +02:00
Zanz2
d6d1f9d490
changed second modal preview styling to fit its specifications
2017-09-14 11:46:41 +02:00
Zanz2
29b9d50363
Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer
2017-09-14 11:30:53 +02:00
Zanz2
9fc91aac32
added protocols io upload preview modal
2017-09-13 16:04:16 +02:00
Zanz2
b7432b336a
added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller
2017-09-13 15:15:08 +02:00
Žan Žagar
706031dacb
added model and controler, model should go to services while the controller should go to protocols controller
2017-09-12 15:25:22 +02:00
Žan Žagar
2a7a2b8fa1
Changed some minor button text and fixed a local error
2017-09-12 09:26:22 +02:00
Žan Žagar
62350d0d42
Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later
2017-09-11 16:03:33 +02:00
Žan Žagar
9b640c5df8
Dropdown menu works, need to add backend code for the second button
2017-09-11 15:28:48 +02:00
Žan Žagar
0f4dadefa9
prvi (star gumb) v dropdownu sedaj deluje
2017-09-11 15:23:09 +02:00
Žan Žagar
f668f60237
dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni
2017-09-11 15:22:22 +02:00
Žan Žagar
31e8c107fd
dodav na pravi branch te file
2017-09-11 14:35:00 +02:00
Jure Grabnar
b4a13dffe3
init commit, dodav na protocols index gumb z dropdown
2017-09-11 13:07:22 +02:00
Luka Murn
85634b2fb6
Add 'off' before setting export button to 'on'
2017-08-07 14:04:39 +02:00
Matej Zrimšek
d90ca1b934
Fixed slow exporting of repositories - JS listeners which triggered function responsible for providing export data was bound more than once. [SCI-1481]
2017-08-02 16:49:53 +02:00
Matej Zrimšek
07fea16d26
Fix permissions for editing and deleting custom repository custom columns. [SCI-1524]
2017-07-28 12:01:11 +02:00
okriuchykhin
af4b310754
Add ordering for column mappings in repositories
2017-07-26 13:35:54 +02:00
Oleksii Kriuchykhin
6a43483a2f
Fix adding and editing repository items [SCI-1519]
2017-07-26 11:22:26 +02:00
okriuchykhin
38f254ae9b
Merge pull request #749 from ZmagoD/zd_SCI_1487
...
don't hide modal [fixes SCI-1487]
2017-07-25 14:35:10 +02:00
zmagod
dfc8ea7fbf
don't hide modal [fixes SCI-1487]
2017-07-25 14:33:41 +02:00
okriuchykhin
532153b9cb
Merge pull request #747 from okriuchykhin/ok_SCI_101
...
Improve samples import speed [SCI-101]
2017-07-25 14:10:45 +02:00
Oleksii Kriuchykhin
efd03db6db
Further samples import improvement [SCI-101]
2017-07-25 10:56:07 +02:00
Matej Zrimšek
ad0dce921b
Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516]
2017-07-24 18:12:41 +02:00
Oleksii Kriuchykhin
67b0c78593
Improve samples import speed [SCI-101]
2017-07-24 17:33:13 +02:00
Oleksii Kriuchykhin
6d56e6b72e
Remove redundant self [SCI-1487]
2017-07-20 11:51:42 +02:00
Oleksii Kriuchykhin
6c33b46f6a
Improve import of repository records plus tsv file import fixes [SCI-1487]
2017-07-20 11:44:10 +02:00
Zmago Devetak
7b898666da
Merge pull request #745 from ZmagoD/zd_SCI_1485
...
refactor repositories js files [fixes SCI-1485]
2017-07-19 11:17:52 +02:00
Oleksii Kriuchykhin
ece27b2652
Fix importing files with empty header cells and error messages improvements [SCI-1484]
2017-07-18 14:54:35 +02:00
zmagod
a2b7bcda4c
refactor repositories js files [fixes SCI-1485]
2017-07-17 15:05:28 +02:00
Oleksii Kriuchykhin
036ee390ed
Fix error messages in repository import and uploading files starting with hyphen[SCI-1484]
2017-07-14 16:19:03 +02:00
Zmago Devetak
77893e6bcb
Merge pull request #743 from ZmagoD/zd_SCI_1483
...
fixes sorting of assigned column [fixes SCI-1483]
2017-07-14 12:01:42 +02:00
zmagod
506e47a595
fixes sorting of assigned column [fixes SCI-1483]
2017-07-14 09:45:36 +02:00
Mojca Lorber
739f8b5b4e
remove redundant rollback call
2017-07-13 13:49:26 +02:00
Mojca Lorber
ec76873e95
fix sorting by assigned causes ajax error
2017-07-13 11:41:19 +02:00
Zmago Devetak
69919359f1
Merge pull request #738 from ZmagoD/zd_SCI_1452
...
fixes issue with smart annotations in repositories [fixes SCI-1452]
2017-07-12 14:50:29 +02:00
Nbernot
2a3e830a3c
Merge pull request #732 from biosistemika/business_users
...
Business users [SCI-1428, SCI-1447]
2017-07-11 13:34:56 +02:00
Nbernot
d746ae2549
Removes parentheses around if conditions
2017-07-11 13:33:47 +02:00
Luka Murn
73a4cd1e4f
Merge pull request #737 from Ducz0r/lm-sci-1450
...
Add versioning modal & support to sciNote [SCI-1450]
2017-07-11 09:47:51 +02:00
zmagod
baaec67399
fixes issue with smart annotations in repositories [fixes SCI-1452]
2017-07-10 16:22:32 +02:00
Oleksii Kriuchykhin
a6b80589f2
Fix default order of the columns in repositories [SCI-1445]
2017-07-10 15:32:18 +02:00
Luka Murn
3e80f761b8
Add "about" modal, prepare hooks, VERSION system for addons
...
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
2017-07-10 15:27:50 +02:00
Luka Murn
16e672b9d8
Add VERSION file where the sciNote Core version is stored
2017-07-10 09:26:35 +02:00
Nejc Bernot
d917cf3340
Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST
2017-07-05 11:52:36 +02:00
Nejc Bernot
803934e07d
Changes the host for the download and redirect paths
2017-07-05 10:23:10 +02:00
Nejc Bernot
91fe7fe4ad
Changes the completely NOT ruby code
2017-07-04 17:13:59 +02:00
Nejc Bernot
bd9904adb3
Adds support for business servers
...
If the WOPI_BUSINESS_USERS environmental variable is set and true, indicates to Office online that all users are business users when trying to view/edit files
2017-07-04 14:27:43 +02:00
Zmago Devetak
53a1dd14b7
Merge pull request #718 from ZmagoD/zd_SCI_1129_v3
...
Fixes error message [fixes SCI-1129]
2017-07-04 11:16:36 +02:00
okriuchykhin
4740564a40
Merge pull request #727 from okriuchykhin/ok_SCI_1445
...
Fix ordering of the columns after adding the new ones [SCI-1445]
2017-07-03 11:55:24 +02:00
Oleksii Kriuchykhin
4c6690e59b
Fix ordering of the columns after adding the new ones [SCI-1445]
2017-07-03 11:53:15 +02:00
lenart
74e723d5d5
Changed data hook name and form id [SCI-1430]
2017-07-03 11:28:35 +02:00
lenart
8ec458db91
Added data hook and form id for GA tracking [SCI-1430]
2017-06-30 10:06:54 +02:00
zmagod
a9f38962bc
Fixes error message [fixes SCI-1129]
2017-06-28 11:17:50 +02:00
Matej Zrimšek
4dbf5b0f53
Fixed sample types page load error, when viewing them on a task level. [SCI-1419]
2017-06-27 16:28:25 +02:00
mlorb
025050a7cd
Merge pull request #716 from mlorb/ml-sci-1420
...
Add tooltips to navigation bar [SCI-1420]
2017-06-27 14:52:07 +02:00
Mojca Lorber
d03be76f35
add tooltips to archive buttons
2017-06-27 14:48:45 +02:00
Mojca Lorber
0160956377
put all titles on links
2017-06-27 14:21:06 +02:00
Mojca Lorber
6bfb5e125c
add tooltips to navigation bar
2017-06-27 13:46:49 +02:00
okriuchykhin
d126391940
Merge pull request #710 from okriuchykhin/ok_SCI_1356
...
Add global search in custom repositories [SCI-1356]
2017-06-27 13:41:53 +02:00
Oleksii Kriuchykhin
69231060b0
Fix checking of my_modules presence [SCI-1356]
2017-06-27 13:39:08 +02:00
Zmago Devetak
6c541602e7
Merge pull request #715 from ZmagoD/zd_SCI_1328_v2
...
fixes smart annotations bug in reports [fixes SCI-1328]
2017-06-27 13:34:29 +02:00
Oleksii Kriuchykhin
4060ba2ac3
Code style fixes [SCI-1356]
2017-06-27 13:23:51 +02:00
mz3944
ca59ac5e36
Merge pull request #714 from mz3944/mz-SCI-1402
...
Missing error message when not selecting name in case of import repository file [SCI-1402]
2017-06-27 11:54:26 +02:00
zmagod
7b9410f02f
fixes smart annotations bug in reports [fixes SCI-1328]
2017-06-27 11:26:32 +02:00
okriuchykhin
ee2cc006af
Merge pull request #712 from okriuchykhin/ok_SCI_1404
...
Fix naming of repository items in modal and messages [SCI-1404]
2017-06-27 09:22:43 +02:00
okriuchykhin
8ae479b370
Merge pull request #713 from okriuchykhin/ok_SCI_1399
...
Remove spinner after samples import error [SCI-1399]
2017-06-27 09:22:21 +02:00
Oleksii Kriuchykhin
938896981d
Remove spinner after samples import error [SCI-1399]
2017-06-26 16:51:58 +02:00
Matej Zrimšek
f847b44067
Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402]
2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin
84556cf744
Fix naming of repository items in modal and messages [SCI-1404]
2017-06-26 16:03:02 +02:00
Oleksii Kriuchykhin
f2f57de264
Fix changing protocol ownership logic when removing user from the team [SCI-1415]
2017-06-26 15:30:18 +02:00
Oleksii Kriuchykhin
fc72453a5b
Fix hound warning [SCI-1356]
2017-06-23 16:19:59 +02:00
Oleksii Kriuchykhin
e038bc58fa
Add global search in custom repositories [SCI-1356]
2017-06-23 16:12:56 +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
