scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-16 06:06:56 +08:00
Code Issues Projects Releases Packages Wiki Activity
7350 commits 31 branches 181 tags 167 MiB
Commit graph

7350 commits

This branch
This branch
All branches
Author SHA1 Message Date
mlorb
905acfd43d Merge pull request #109 from mlorb/ml_sci_286 
fixes notification when adding new sample [SCI-286]
 2016-08-30 17:54:45 +02:00
Mojca Lorber
dd8e5d5e12 fixes hound 2016-08-30 17:12:26 +02:00
Mojca Lorber
1b1e6daa21 fixes notification disappearance and error notifications 2016-08-30 16:55:59 +02:00
Jure Grabnar
9a82e7d72b Connect tasks on moving 
SCI-328 #close
 2016-08-30 15:57:27 +02:00
mlorb
8fc29248b3 Merge pull request #119 from mlorb/ml_sci_396 
fixes missing experiment name in side bar [SCI-396]
 2016-08-30 15:05:04 +02:00
Zmago Devetak
11b314fa20 Merge pull request #107 from ZmagoD/zd_bug_fix 
fixes new task button after tutorial ends
 2016-08-30 15:04:11 +02:00
Zmago Devetak
375a72db18 Merge pull request #114 from ZmagoD/zd_SCI_294_vol2 
fixes reports file name [fixes SCI-294]
 2016-08-30 14:59:07 +02:00
Zmago Devetak
5b4eb07960 Merge pull request #118 from ZmagoD/zd_SCI_398 
fixes workflow img bug [fixes SCI-398]
 2016-08-30 14:55:33 +02:00
Mojca Lorber
52f228725a fixes hound 2016-08-30 14:04:47 +02:00
Mojca Lorber
aeda6f77d2 fixes missing experiment name in side bar 2016-08-30 13:51:16 +02:00
zmagod
a947354fb5 fixes update times [fixes SCI-398] 2016-08-30 13:23:48 +02:00
Luka Murn
c6e575bd2a Merge pull request #115 from Ducz0r/lm-deleting-comments-fix 
Fix for deleting comments
 2016-08-30 13:15:35 +02:00
Luka Murn
2b382fee0f Merge pull request #113 from Ducz0r/lm-add-first-time-activities 
Fix first time data generator & fake data generator
 2016-08-30 13:07:52 +02:00
Luka Murn
0e0228cb8c Codestyle fixes 2016-08-30 13:06:49 +02:00
Luka Murn
9391eea6df Add experiment thumbnails generation to fake data rake 2016-08-30 13:04:58 +02:00
zmagod
95ab35e3d6 cleanup update timestamp 2016-08-30 12:58:52 +02:00
mlorb
859ce35612 Merge pull request #117 from mlorb/ml_sci_395 
fixes merge again
 2016-08-30 12:58:38 +02:00
Mojca Lorber
43c3a0bb81 fixes merge again 2016-08-30 12:54:08 +02:00
mlorb
6991ba54bb Merge pull request #116 from mlorb/ml_sci_395 
fixes merge
 2016-08-30 12:20:30 +02:00
Mojca Lorber
81f9e59dcd fixes merge 2016-08-30 12:14:15 +02:00
Mojca Lorber
e8d187b5f6 Merge branch 'ml_sci_395' 
Conflicts:
	app/views/canvas/edit/modal/_move_module.html.erb
	app/views/canvas/edit/modal/_move_module_group.html.erb
 2016-08-30 11:41:25 +02:00
Luka Murn
77ec5bcff9 Reposition comment dropdowns horizontally if needed 
Closes SCI-258
 2016-08-30 11:39:50 +02:00
zmagod
f356acb882 fixes reports file name [fixes SCI-294] 2016-08-30 11:36:39 +02:00
Zmago Devetak
6878adda46 Merge pull request #112 from ZmagoD/zd_SCI_338_vol2 
Tutorial
 2016-08-30 11:07:51 +02:00
Luka Murn
4ee4c6caba Remove JS validator from step comments 2016-08-30 11:06:30 +02:00
jbargu
fa357dd54f Merge pull request #110 from jbargu/jg_SCI_328_move_task_no_experiment 
Remove move on empty experiments
 2016-08-30 11:06:16 +02:00
zmagod
4b6567e488 fixed workflowimg link 2016-08-30 11:03:33 +02:00
zmagod
6f1c4df942 fixed new task button in canvas 2016-08-30 10:48:28 +02:00
Luka Murn
491459f63a Fix fake data generator 2016-08-30 10:23:25 +02:00
Zmago Devetak
e96429409e Merge pull request #108 from ZmagoD/zd_SCI_247_vol2 
Fixes step destroing bug and fixes reports [fixes SCI-247]
 2016-08-30 09:57:56 +02:00
zmagod
57c1707e81 fixes secondary navigation [fixes SCI-338] 2016-08-30 09:53:56 +02:00
Luka Murn
c86d21d689 Fix bug in organization.rb 
Bug was related to introduction of experiment level.
 2016-08-30 09:46:54 +02:00
Mojca Lorber
a35bf7182f fixes troubles 2016-08-30 09:43:39 +02:00
zmagod
e02478b1f9 fixed tutorial labels 2016-08-30 09:35:57 +02:00
Mojca Lorber
596d403d5f change position of buttons 2016-08-30 09:16:53 +02:00
Zmago Devetak
0eda62a958 Merge pull request #106 from ZmagoD/zd_SCI_336_vol_2 
Adds new image [fixes SCI-336]
 2016-08-30 08:58:53 +02:00
zmagod
d33bb50519 disabled secondary navigation in samples tutorial 2016-08-30 08:57:05 +02:00
zmagod
5518d1cd1e fixed 16 step of tutorial 2016-08-30 08:52:44 +02:00
Jure Grabnar
0c184dcdcf Remove Move button on empty experiments 
SCI-328 #close.
 2016-08-30 08:26:59 +02:00
Luka Murn
30e8e33774 Add comment activities to first time data generator 2016-08-30 08:19:35 +02:00
Mojca Lorber
b07f1af90f fixes hound again again 2016-08-29 17:08:00 +02:00
Mojca Lorber
7f8bb9be53 fixes hound again 2016-08-29 13:59:51 +02:00
Mojca Lorber
60b0d69a72 fixes hound 2016-08-29 13:56:05 +02:00
Mojca Lorber
53cdbc2638 fixes notification when adding new sample 2016-08-29 13:45:54 +02:00
Luka Murn
25928bfa0b Update .buildpacks 2016-08-29 13:24:53 +02:00
zmagod
17aacc8ff5 fixes step destroing bug and fixes reports [fixes SCI-247] 2016-08-29 12:04:46 +02:00
zmagod
5af9d10c6a fixes new task button after tutorial ends 2016-08-29 11:46:45 +02:00
zmagod
2ac20d1af1 adds new image + new panel title [fixes SCI-336] 2016-08-29 09:28:29 +02:00
Luka Murn
77c9c01ec7 Stop ignoring /billing in .gitignore 2016-08-28 13:43:28 +02:00
Luka Murn
5c13c89156 Merge pull request #105 from biosistemika/lm-jg-archive-experiment 
Add missing commits for showing image and not able to preview
 2016-08-26 16:52:25 +02:00