scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-10 17:36:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
520 commits 44 branches 180 tags 166 MiB
Commit graph

520 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luka Murn
77f00bf3a7 Bump version to 1.2.2 2016-09-01 11:34:28 +02:00
Luka Murn
2c519284ee Merge pull request #124 from ZmagoD/zd_fix_popup_cookie 
introdutory popup cookie
 2016-09-01 11:34:05 +02:00
zmagod
ac7ac95da8 [fixes SCI-332] 2016-09-01 10:38:20 +02:00
Matej Zrimšek
4fdf478426 Minor refactoring. 2016-08-31 17:57:06 +02:00
Matej Zrimšek
828eebeb16 Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399] 2016-08-31 17:21:17 +02:00
zmagod
55ba2de41f fixes object duplication 2016-08-31 16:34:08 +02:00
zmagod
fabfa83171 introdutory popup cookie 2016-08-31 15:18:21 +02:00
zmagod
e8f971829a added project to session storage 2016-08-31 15:13:17 +02:00
Luka Murn
9ceea255b2 Bump version to 1.2.1 2016-08-31 14:29:27 +02:00
Luka Murn
58ad19f80b Merge pull request #123 from Ducz0r/lm-fix-js-default-params 
Fix the default parameters in JS
 2016-08-31 14:23:02 +02:00
Luka Murn
5cb79f6282 Fix the default parameters in JS 
This was causing major issues in IE.
 2016-08-31 14:04:45 +02:00
Luka Murn
bd414c8b4f Update a problematic migration 2016-08-31 11:46:27 +02:00
Luka Murn
ae9959dc3c Bump version to 1.2.0 2016-08-31 11:22:03 +02:00
Zmago Devetak
985980183f Merge pull request #122 from ZmagoD/zd_SCI_402 
fixes searching tables bug [fixes SCI-402]
 2016-08-31 11:07:19 +02:00
zmagod
eb394ce209 fixes searching tables bug [fixes SCI-402] 2016-08-31 11:01:10 +02:00
zmagod
b05c3df4d3 adds toggle id only to elements with modules 2016-08-31 10:25:40 +02:00
Zmago Devetak
bc73579c68 Merge pull request #121 from ZmagoD/zd_SCI_398_vol2 
[fixes SCI-398] again
 2016-08-31 09:46:04 +02:00
zmagod
eb39eedfdf [fixes SCI-398] again 2016-08-31 08:46:51 +02:00
zmagod
21f84bacb6 set sidebar collapsed elements 2016-08-31 08:24:59 +02:00
jbargu
2cd5d85d68 Merge pull request #120 from jbargu/jg_SCI_328_move_experiment_reconnect 
When moving a task, it should connect the source and destination
 2016-08-30 18:01:38 +02:00
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