scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-30 20:06:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
2476 commits 69 branches 179 tags 165 MiB
Commit graph

599 commits

Author SHA1 Message Date
zmagod c5e32c4ea0 Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch 2017-08-21 09:52:14 +02:00
zmagod bd352869a3 adds user account dropdown 2017-08-09 09:08:13 +02:00
zmagod 226458a3f0 adds recent notifications 2017-08-08 15:44:28 +02:00
zmagod be42cd2204 refactor 2017-08-07 13:51:22 +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
zmagod c314bae28d add team switch js/controller 2017-08-03 16:03:15 +02:00
zmagod 2e83322f76 fixes global activities 2017-08-03 11:17:09 +02:00
zmagod 6ef19725f1 adds redux 2017-08-02 17:27:05 +02:00
zmagod caae1e2fe8 adds intl, router, bootstrap to npm modules 2017-07-31 10:42:40 +02:00
Toni Dezman f76512f364 adds hound recomendations for react/settings_controller.rb 2017-07-28 12:53:15 +02:00
Toni Dezman 1673d43993 adds react/settings controller and react/layout 2017-07-27 15:26:03 +02:00
Oleksii Kriuchykhin 6a43483a2f Fix adding and editing repository items [SCI-1519] 2017-07-26 11:22:26 +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 ece27b2652 Fix importing files with empty header cells and error messages improvements [SCI-1484] 2017-07-18 14:54:35 +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
Mojca Lorber 739f8b5b4e remove redundant rollback call 2017-07-13 13:49:26 +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
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
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
okriuchykhin 75c887ce7d Merge pull request #721 from okriuchykhin/ok_SCI_1412 
Fix activities [SCI-1412]
 2017-07-04 10:59:08 +02:00
zmagod bc33883c3c first run fixing addons 2017-06-30 10:23:28 +02:00
Oleksii Kriuchykhin e474cda03a Fix activities [SCI-1412] 2017-06-28 16:49:50 +02:00
Oleksii Kriuchykhin 21cce4baa0 Fix global search [SCI-1411] 2017-06-28 15:44:18 +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 4060ba2ac3 Code style fixes [SCI-1356] 2017-06-27 13:23:51 +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 e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
zmagod 819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +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 e7328c2e20 fixes row dupplication [fixes SCI-1385] 2017-06-22 16:01:37 +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
Matej Zrimšek d907819de5 Removed byebug calls. [SCI-1383] 2017-06-21 10:49:00 +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
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 9b941fe374 fix flash when deleting samples of other users 2017-06-16 17:12:04 +02:00
Mojca Lorber 1b683bc70e fix error msg when editing empty cell in repositories 2017-06-16 15:09:04 +02:00