1958 commits

Author	SHA1	Message	Date
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	13eae287bb	Revert "Add core API using JWT authentication and tests for it [SCI-1507]"	2017-08-07 11:54:45 +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
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
Toni Dezman	9a1cf53046	Merge pull request #758 from programmertoni/td_SCI_1492 ... Td sci 1492	2017-07-29 05:44:47 +02:00
Toni Dezman	f76512f364	adds hound recomendations for react/settings_controller.rb	2017-07-28 12:53:15 +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
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
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
Oleksii Kriuchykhin	ba35717243	Fix babel and eslint config [SCI-1461]	2017-07-13 14:11:01 +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
Oleksii Kriuchykhin	b8e93ee883	Add Webpacker and React [SCI-1461]	2017-07-12 16:41:55 +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
Luka Murn	9f60ece25f	Merge branch 'master' into rails-5.1 ... Conflicts: app/models/repository.rb app/models/repository_row.rb app/views/projects/index.html.erb app/views/shared/_secondary_navigation.html.erb	2017-07-06 15:12:15 +02:00
zmagod	750c82a80f	setup testing tools [fixes SCI-1400]	2017-07-06 09:07:05 +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