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

526 commits

Author SHA1 Message Date
Toni Dezman 78f26525e9 Settings SPA works 2017-07-27 13:53:29 +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
Oleksii Kriuchykhin b8e93ee883 Add Webpacker and React [SCI-1461] 2017-07-12 16:41:55 +02:00
Luka Murn bc8d945101 Damn, I spent too much time on GeneIO. Fixing again >_< 2017-07-07 13:19:39 +02:00
Luka Murn e9ef7b61ef Fix WickedPdf bug on production 2017-07-07 13:05:18 +02:00
mz3944 f55861b373 Merge pull request #731 from mz3944/mz-SCI-1413 
Fixed some RoR 5.1 default settings. [SCI-1413]
 2017-07-06 17:17:27 +02:00
Luka Murn 4317da343b Don't use listen gem in development mode 2017-07-06 16:49:50 +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
Matej Zrimšek 9d0fd4e76f Reverted settings for WebSockets, because we might use redis subscription adapter. [SCI-1413] 2017-07-06 12:55:58 +02:00
zmagod 750c82a80f setup testing tools [fixes SCI-1400] 2017-07-06 09:07:05 +02:00
Matej Zrimšek 843116f645 Fixed some RoR 5.1 default settings. [SCI-1413] 2017-07-04 14:42:53 +02:00
Luka Murn 9a19cb711f Version bump to 1.12.1 2017-07-04 08:00:32 +02:00
zmagod fd13921720 fixes repeat tutorial [fixes SCI-1410] 2017-06-29 11:00:50 +02:00
zmagod 525c9770ac fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
zmagod 71aa05bb0e refactor 2017-06-27 14:58:49 +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 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
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
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
zmagod 819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
Zmago Devetak d726c121bc Version bump to 1.12.0 2017-06-23 12:37:19 +02:00
Matej Zrimšek be855e98db Changed repository records filter naming. [SCI-1398] 2017-06-23 10:16:50 +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
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
Mojca Lorber 86530bbda0 fix flash text 2017-06-16 14:41:50 +02:00
Mojca Lorber b6f146f177 fix cog position on repositories page 2017-06-16 11:54:31 +02:00
Mojca Lorber 4566fc7191 fix text in activity for assign/unassign records message 2017-06-15 10:06:12 +02:00
Mojca Lorber 77d922a5e8 change the name of add record/repository in repositories 2017-06-13 09:45:18 +02:00
zmagod a865253a2e first run 2017-06-13 08:10:10 +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
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
Mojca Lorber 71c523c406 load tabs with javascript 2017-06-08 13:47:30 +02:00
Luka Murn 810599bef2 Fix en.yml localization bug 2017-06-08 13:36:37 +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 e0828657b3 Somebody kill the Hound please 2017-06-08 11:23:24 +02:00
Luka Murn 9bfbf3b634 Minor fix #2 2017-06-08 11:22:27 +02:00
Luka Murn b729c06f31 Minor fix 2017-06-08 11:20:11 +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
Luka Murn 0aee11d6d8 Hound is love, Hound is life #2 2017-06-07 18:26:32 +02:00
Luka Murn 42f7b4f68d Hound is love, Hound is life 2017-06-07 18:22:15 +02:00
Matej Zrimšek 77a225ec31 Added toggle between assigned and all repository records. [SCI-1276] 2017-06-07 18:13:25 +02:00