mlorb
|
126f278308
|
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json
Scinote protocols IO base branch
|
2017-11-06 14:53:01 +01:00 |
|
Zanz2
|
4354363215
|
rubocop refactor css
|
2017-11-03 16:46:03 +01:00 |
|
Zanz2
|
ac26b17ddf
|
Rubocop refactor
|
2017-11-03 16:45:15 +01:00 |
|
okriuchykhin
|
db9a031581
|
Merge pull request #813 from okriuchykhin/ok_SCI_1642
Refactor canvas [SCI-1642]
|
2017-10-12 17:45:34 +02:00 |
|
Oleksii Kriuchykhin
|
b26b963e54
|
Optimize update canvas SQL and remove module group name [SCI-1642]
|
2017-10-05 16:19:25 +02:00 |
|
Zanz2
|
dd4d4072e8
|
Made code more aesthetic
|
2017-09-22 16:02:56 +02:00 |
|
Zanz2
|
4051c0b06b
|
Deleted old unused files i spotted on github
|
2017-09-22 13:28:38 +02:00 |
|
Zanz2
|
6a07aa28e4
|
Accidentally removed this line after reviewing git changes, adding it back
|
2017-09-22 13:11:49 +02:00 |
|
Zanz2
|
d59234a1e3
|
minor changes, working on refresh after submit
|
2017-09-20 16:04:52 +02:00 |
|
Zanz2
|
d85e02730d
|
Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc
|
2017-09-15 12:19:58 +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
|
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
|
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 |
|
Jure Grabnar
|
b4a13dffe3
|
init commit, dodav na protocols index gumb z dropdown
|
2017-09-11 13:07:22 +02:00 |
|
Mojca Lorber
|
a0f7030a70
|
fix bug with tinyMCE text validaton
|
2017-09-07 14:54:12 +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 |
|
zmagod
|
dfc8ea7fbf
|
don't hide modal [fixes SCI-1487]
|
2017-07-25 14:33:41 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
4c6690e59b
|
Fix ordering of the columns after adding the new ones [SCI-1445]
|
2017-07-03 11:53:15 +02:00 |
|
zmagod
|
a9f38962bc
|
Fixes error message [fixes SCI-1129]
|
2017-06-28 11:17:50 +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 |
|
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 |
|
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
|
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
|
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 |
|
zmagod
|
1690d8ebe3
|
removed reload on hide modal
|
2017-06-22 16:47:50 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|