Luka Murn
|
8e999e673a
|
Remove scinote-web.tgz from index
|
2017-08-23 08:40:47 +02:00 |
|
Luka Murn
|
ec7b7ffe08
|
You are my sunshine, my only sunshine,
You make me happy when skies are grey
You never know, Hound, how much I love you
Please don't take my Hound away
|
2017-08-10 14:42:58 +02:00 |
|
Luka Murn
|
9227ea5854
|
Finish the user settings jsonb, also fix references throughout app
Closes SCI-1475.
|
2017-08-10 14:29:01 +02:00 |
|
Luka Murn
|
c62002381b
|
Add default settings migration and concern
|
2017-08-10 11:30:57 +02:00 |
|
Luka Murn
|
5115890d07
|
Merge pull request #766 from biosistemika/revert-763-ok_SCI_1507
Revert "Add core API using JWT authentication and tests for it [SCI-1507]"
|
2017-08-07 11:56:05 +02:00 |
|
Luka Murn
|
13eae287bb
|
Revert "Add core API using JWT authentication and tests for it [SCI-1507]"
|
2017-08-07 11:54:45 +02:00 |
|
Luka Murn
|
f92641af14
|
Merge pull request #765 from biosistemika/revert-758-td_SCI_1492
Revert "Td sci 1492"
|
2017-08-07 11:48:54 +02:00 |
|
Luka Murn
|
c6448264d0
|
Revert "Td sci 1492"
|
2017-08-07 11:47:21 +02:00 |
|
Luka Murn
|
ae5bccf709
|
Merge branch 'master' into rails-5.1
Conflicts:
Gemfile.lock
app/datatables/repository_datatable.rb
app/models/repository_cell.rb
|
2017-08-07 08:45:53 +02:00 |
|
okriuchykhin
|
b52f9cb4d9
|
Merge pull request #763 from okriuchykhin/ok_SCI_1507
Add core API using JWT authentication and tests for it [SCI-1507]
|
2017-08-04 10:26:35 +02:00 |
|
Oleksii Kriuchykhin
|
35b643f34e
|
Fix typo in config and code style improvements [SCI-1507]
|
2017-08-04 10:19:56 +02:00 |
|
Oleksii Kriuchykhin
|
e958410261
|
Add core API using JWT authentication and tests for it [SCI-1507]
|
2017-08-03 17:00:14 +02:00 |
|
Luka Murn
|
6239e01536
|
Bump version to 1.12.3
|
2017-08-03 13:35:41 +02:00 |
|
Toni Dezman
|
9a1cf53046
|
Merge pull request #758 from programmertoni/td_SCI_1492
Td sci 1492
|
2017-07-29 05:44:47 +02:00 |
|
mz3944
|
25f4095446
|
Merge pull request #756 from mz3944/mz_SCI_1524
Fix permissions for editing and deleting custom repository custom columns. [SCI-1524]
|
2017-07-28 15:58:33 +02:00 |
|
Toni Dezman
|
5a922b3f85
|
adds yarn.lock file
|
2017-07-28 14:15:15 +02:00 |
|
Toni Dezman
|
f76512f364
|
adds hound recomendations for react/settings_controller.rb
|
2017-07-28 12:53:15 +02:00 |
|
Zmago Devetak
|
bb63646203
|
Merge pull request #754 from ZmagoD/zd_SCI_1470
fixes failing tests [fixes SCI-1470]
|
2017-07-28 12:04:50 +02:00 |
|
zmagod
|
ca3e89ab62
|
fix hound
|
2017-07-28 12:03:44 +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 |
|
Toni Dezman
|
ffda8b259b
|
adds Redux and changes to index.jsx page
|
2017-07-28 10:52:25 +02:00 |
|
zmagod
|
b69ec22dfe
|
fixes failing tests [fixes SCI-1470]
|
2017-07-28 10:14:50 +02:00 |
|
Toni Dezman
|
1673d43993
|
adds react/settings controller and react/layout
|
2017-07-27 15:26:03 +02:00 |
|
Toni Dezman
|
d781ff9b2d
|
removes unnecessary code from packs/settings/index.jsx
|
2017-07-27 14:22:28 +02:00 |
|
Toni Dezman
|
0f4286d5d1
|
adds Settings index react page
|
2017-07-27 14:21:27 +02:00 |
|
Toni Dezman
|
1ce787603e
|
adds immutable.js
|
2017-07-27 14:06:09 +02:00 |
|
Toni Dezman
|
78f26525e9
|
Settings SPA works
|
2017-07-27 13:53:29 +02:00 |
|
Zmago Devetak
|
f43419d9a9
|
Merge pull request #733 from ZmagoD/zd_SCI_1400
setup testing tools [fixes SCI-1400]
|
2017-07-26 16:23:31 +02:00 |
|
zmagod
|
416ab8eee3
|
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into zd_SCI_1400
|
2017-07-26 16:20:09 +02:00 |
|
zmagod
|
cd7ababab0
|
fix sample types
|
2017-07-26 16:16:08 +02:00 |
|
Luka Murn
|
61e4072c62
|
Bump version to 1.12.2
|
2017-07-26 13:39:21 +02:00 |
|
okriuchykhin
|
af4b310754
|
Add ordering for column mappings in repositories
|
2017-07-26 13:35:54 +02:00 |
|
okriuchykhin
|
1f7528d4a4
|
Merge pull request #751 from okriuchykhin/ok_SCI_1519
Fix adding and editing repository items [SCI-1519]
|
2017-07-26 11:25:43 +02:00 |
|
Oleksii Kriuchykhin
|
6a43483a2f
|
Fix adding and editing repository items [SCI-1519]
|
2017-07-26 11:22:26 +02:00 |
|
Zmago Devetak
|
a423315800
|
Merge pull request #729 from ZmagoD/zd_SCI_1418
fixes bug with devise_security_extension [fixes SCI-1418]
|
2017-07-25 14:36:05 +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 |
|
mz3944
|
895eb22702
|
Merge pull request #748 from mz3944/mz-SCI-1516
Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516]
|
2017-07-25 10:49:33 +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 |
|
okriuchykhin
|
a49c35df9f
|
Merge pull request #746 from okriuchykhin/ok_SCI_1487
Improve import of repository records plus tsv file import fixes [SCI-1487]
|
2017-07-21 11:01:31 +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 |
|
okriuchykhin
|
c504382f68
|
Merge pull request #744 from okriuchykhin/ok_SCI_1484
Fix error messages in repository import and uploading files starting with hyphen [SCI-1484]
|
2017-07-18 15:19:10 +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 |
|