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

831 commits

Author SHA1 Message Date
zmagod db16da7bd6 adds custom query to fetch teams data 2017-08-25 16:07:37 +02:00
zmagod 34be62a648 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1493_v3 2017-08-25 08:58:20 +02:00
zmagod 782daabce1 first run 2017-08-25 08:54:32 +02:00
Toni Dezman dd5c329ef1 makes redux work with Notifications 2017-08-22 09:46:44 +02:00
Toni Dezman 522262f9fe adds timezone 2017-08-22 09:46:29 +02:00
Toni Dezman 52b1603b92 adds MyStatistics logic 2017-08-22 09:44:51 +02:00
Toni Dezman a3d126b073 adds Redux and few fields 2017-08-22 09:41:47 +02:00
Toni Dezman 0de080485e adds avatar and editable inputs 2017-08-22 09:39:50 +02:00
zmagod 685cb42aac fixes repository, protocols link, adds csfr token to request headers 2017-08-21 15:30:54 +02:00
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
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
zmagod 007f50a158 adds main stylesheet for global styles 2017-08-09 12:46:04 +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
Luka Murn c6448264d0 Revert "Td sci 1492" 2017-08-07 11:47:21 +02:00
zmagod be29db2f78 changed folder name 2017-08-07 11:13:09 +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
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 ffda8b259b adds Redux and changes to index.jsx page 2017-07-28 10:52:25 +02:00
Toni Dezman 1673d43993 adds react/settings controller and react/layout 2017-07-27 15:26:03 +02:00
Toni Dezman 0f4286d5d1 adds Settings index react page 2017-07-27 14:21:27 +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
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
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
okriuchykhin 2e24e6b73a Merge pull request #725 from okriuchykhin/ok_SCI_1409 
Fix datatables [SCI-1409]
 2017-07-03 15:47:19 +02:00
Oleksii Kriuchykhin b234c07c13 Fix datatables [SCI-1409] 2017-07-03 15:33:50 +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
Mojca Lorber a3514bdaf0 fix restore action from archives pages 2017-06-29 16:14:25 +02:00
Mojca Lorber 4fb07e1e4f fix edit comments 2017-06-29 13:33:59 +02:00
Mojca Lorber 2ab74c8979 add user variable 2017-06-29 12:56:14 +02:00
Mojca Lorber 21b4ba7627 fix bugs on projects page 2017-06-28 17:15:09 +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
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 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 2b2f513366 fixes export pdf error on production 2017-06-22 16:40: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
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 f66fb49b56 adds import records to repositories [fixes SCI-1336] 2017-06-21 14:45:50 +02:00
zmagod f64e1ac713 fix locales 2017-06-21 09:31:39 +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 122ac7971f Merge pull request #692 from mlorb/ml_sci_1348 
Fix cog position on repositories page [SCI-1348]
 2017-06-19 15:16:01 +02:00
zmagod 70fa681519 split the import service 2017-06-19 14:05:37 +02:00
Mojca Lorber 4c3036af87 fix ordering of repositoris on task 2017-06-19 10:53:18 +02:00
Mojca Lorber b6f146f177 fix cog position on repositories page 2017-06-16 11:54:31 +02:00
Oleksii Kriuchykhin 94d74b8101 Make assigned column always visible in repositories [SCI-1346] 2017-06-16 11:47:41 +02:00
zmagod 2d3b5f4308 refactor 2017-06-14 10:55:24 +02:00
zmagod cee052fc19 added service object 2017-06-14 09:11:20 +02:00
okriuchykhin 97a94ff4a3 Merge pull request #679 from okriuchykhin/ok_SCI_1345 
Fix repository view permissions for team guests [SCI-1345]
 2017-06-13 15:47:44 +02:00
mlorb 074a47aae1 Merge pull request #675 from mlorb/ml_sci_1272 
Fix permissions [SCI-1272]
 2017-06-13 10:51:04 +02:00
Oleksii Kriuchykhin 2d693a3fb7 Fix repository view permissions for team guests [SCI-1345] 2017-06-13 10:33:08 +02:00
Zmago Devetak 19adddbfdb Merge pull request #666 from ZmagoD/zd_SCI_1337 
truncate long repository names [fixes SCI-1337]
 2017-06-13 09:32:43 +02:00
mlorb d0d7dc7468 Merge pull request #677 from mlorb/ml_sci_1344 
Change custom repositories icon [SCI-1344]
 2017-06-13 08:57:22 +02:00
zmagod a865253a2e first run 2017-06-13 08:10:10 +02:00
Mojca Lorber faa6456e28 change custom repositories icon 2017-06-12 18:00:28 +02:00
Mojca Lorber 9108102b42 fix permissions 2017-06-12 17:34:36 +02:00
Matej Zrimšek 29b721365a Moved export form to proper place in the code. [SCI-1275] 2017-06-09 19:44:28 +02:00
rekonder 4df8e1ffe3 Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository 2017-06-09 19:44:28 +02:00
rekonder ede744849b Export repository [aj-SCI-1275] 2017-06-09 19:44:28 +02:00
Luka Murn e26337d5ee Merge pull request #671 from biosistemika/custom-repositories 
Merge custom-repositories into master
 2017-06-09 18:46:47 +02:00
zmagod ee9eaea47c truncate long repository names [fixes SCI-1337] 2017-06-09 11:20:57 +02:00
Zmago Devetak 4873624cec Merge pull request #658 from ZmagoD/zd_SCI_1011 
Multiple file upload with drag & drop capability in steps and results
 2017-06-09 10:03:33 +02:00
zmagod 33b996ffee refactor 2017-06-09 09:49:57 +02:00
Luka Murn c7c3c46d9d Fix dropdown 2017-06-08 15:26:57 +02:00
Mojca Lorber be52af4e4f fix rename/delete/copy modals not working 2017-06-08 15:13:00 +02:00
Mojca Lorber 0004c2b7d5 fix selection of tab after redirection 2017-06-08 14:17:27 +02:00
Mojca Lorber 71c523c406 load tabs with javascript 2017-06-08 13:47:30 +02:00
Luka Murn 2ab31aba2f Merge pull request #660 from Ducz0r/lm-sci-1270 
Copy repository functionality [SCI-1270]
 2017-06-08 11:45:57 +02:00
Luka Murn 27feb46d8f Merge pull request #659 from Ducz0r/lm-sci-1279 
Include repositories in reports [SCI-1279]
 2017-06-08 11:24:21 +02:00
Luka Murn 61eb52f86f Implement GUI for copying repositories 
Closes SCI.1270.
 2017-06-07 19:11:25 +02:00
Luka Murn 38361e4bb4 Setup initial GUI 2017-06-07 18:43:48 +02:00
Matej Zrimšek 77a225ec31 Added toggle between assigned and all repository records. [SCI-1276] 2017-06-07 18:13:25 +02:00
Luka Murn 02dd6636ba Allow saving & editing of reports with repository elements 
Closes SCI-1279.
 2017-06-07 16:55:00 +02:00
Luka Murn b5f6d1da94 Allow custom repositories to be added to reports 2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin 8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
Zmago Devetak fcec42ae31 Merge pull request #645 from ZmagoD/zd_SCI_1278 
generates samples csv file in background job [fixes SCI-1278]
 2017-06-07 15:04:24 +02:00
zmagod c6bb20039b adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285] 2017-06-07 13:29:39 +02:00