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

1268 commits

Author SHA1 Message Date
zmagod
b0f6b1f4d0 fixed comments action on project page 2016-10-05 15:39:54 +02:00
Zmago Devetak
eea310514a Merge pull request #194 from ZmagoD/zd_SCI_531_533 
Notification style fixes
 2016-10-05 15:27:36 +02:00
zmagod
bca3d19562 fixed comment options dropdown position 2016-10-05 15:26:11 +02:00
Zmago Devetak
71ad5bf034 Merge pull request #190 from ZmagoD/zd_SCI_529 
Prepare settings screen for notifications
 2016-10-05 14:54:47 +02:00
okriuchykhin
bfa7e57bd8 Merge pull request #168 from okriuchykhin/ok_SCI-463 
Fixes issue with unexpected notification windows [fixes SCI-463]
 2016-10-05 14:45:23 +02:00
zmagod
f9d956bbca fix notifications number on [fixes SCI-531] 2016-10-05 11:50:57 +02:00
zmagod
d90f17d1eb clean comments date duplication [fixes SCI-469] 2016-10-05 08:42:32 +02:00
zmagod
a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Luka Murn
61cb9651c7 Merge pull request #188 from biosistemika/global-notifications 
Global notifications
 2016-10-04 08:30:50 +02:00
zmagod
c9bbab1004 added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users 2016-10-03 20:31:00 +02:00
mlorb
153b692c0c Merge pull request #181 from mlorb/ml_sci_321 
Displaying more information for individual samples in Sample table [SCI-321]
 2016-10-03 16:37:35 +02:00
zmagod
36fb2713b3 start fixing comments dates 2016-10-03 16:10:20 +02:00
Zmago Devetak
91c7d8a952 Merge pull request #176 from ZmagoD/zd_SCI_474 
Unify the comments
 2016-10-03 15:26:17 +02:00
Jure Grabnar
f727289935 Add lock check for editing result 2016-10-03 13:43:35 +02:00
zmagod
77df0bc82c cleans more comment link 2016-10-03 12:34:16 +02:00
Mojca Lorber
093fbd6b8e fixes hound again 2016-10-03 10:40:32 +02:00
Mojca Lorber
2041f2a09d fixes hound 2016-10-03 10:15:46 +02:00
Mojca Lorber
053cd8ed84 removes handler 2016-10-03 10:12:13 +02:00
zmagod
b9bc2f17c8 fixing hound 2016-10-03 08:27:13 +02:00
zmagod
2ee02ec472 mark all seen notifications 2016-10-03 08:20:23 +02:00
Luka Murn
c83342d9f0 Merge pull request #173 from okriuchykhin/ok_SCI-484 
Fix issue with duplicate error messages in experiments modal [SCI-484]
 2016-09-30 08:24:51 +02:00
zmagod
e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
Mojca Lorber
f4345f3aef fixes hound 2016-09-28 16:09:39 +02:00
Mojca Lorber
efa7a1d7b5 add sample information in pop-up 2016-09-28 15:46:41 +02:00
zmagod
2a86aaf7e4 changed popout content [fixes SCI-520] 2016-09-28 15:12:30 +02:00
zmagod
dad0d3868b fixing hound 2016-09-27 17:31:37 +02:00
zmagod
402a77526a cleaned console.log 2016-09-27 16:22:09 +02:00
zmagod
2235778110 fixed project and task comments + fixed date issue 2016-09-27 16:19:31 +02:00
zmagod
0d322eba13 fixed hound 2016-09-27 11:03:10 +02:00
zmagod
4903cb970c removed comments helper 2016-09-27 10:47:18 +02:00
zmagod
1eb9f772f4 refactor sciNote comments js and unified all comments behavior [fixes SCI-474] 2016-09-27 10:30:48 +02:00
zmagod
1cdfde827f fixes protocol and results comments 2016-09-27 09:26:25 +02:00
zmagod
980ff63104 fixed task comments 2016-09-27 09:18:46 +02:00
zmagod
02bfa1949e fixed project comments 2016-09-27 09:00:02 +02:00
Oleksii Kriuchykhin
8a3a9451e9 Fix issue with duplicate error messages in experiments modal [SCI-484] 2016-09-26 12:58:22 +02:00
Oleksii Kriuchykhin
db1e24202a Minor code cleanup [fixes SCI-463] 2016-09-26 09:08:38 +02:00
Mojca Lorber
c2b742374f adding popup sample info 2016-09-23 17:45:02 +02:00
Oleksii Kriuchykhin
2c144aa2f3 Fix issue with unexpected notification windows appearing after report editor exit [fixes SCI-463] 2016-09-23 11:56:13 +02:00
Zmago Devetak
2b678998d3 Merge pull request #166 from ZmagoD/zd_SCI_471 
fixes load comments [fixes SCI-471]
 2016-09-23 09:17:27 +02:00
zmagod
4f2df691ba add error validations 2016-09-23 08:34:39 +02:00
zmagod
6143b257d0 fixes edit modal [fixes SCI-467] 2016-09-23 08:32:46 +02:00
Matej Zrimšek
0317872bc0 Added check if no comments are present for file result, which caused JS error. 2016-09-22 18:12:35 +02:00
mz3944
cde7f3805f Merge pull request #165 from mz3944/mz_replace_hardcoded_values_with_constants_v2 
Added missing validation for protocol description.
 2016-09-22 17:36:18 +02:00
Matej Zrimšek
13e886f7a9 Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408] 2016-09-22 17:35:23 +02:00
okriuchykhin
087ee08976 Merge pull request #164 from okriuchykhin/ok_SCI-400 
Fixes issue with new experiment modal and with move of experiments [fixes SCI-400]
 2016-09-22 17:01:58 +02:00
okriuchykhin
729cbef27b Merge pull request #156 from okriuchykhin/ok_SCI-459 
Fixes issue with too many " | " signs in error message [fixes SCI-459]
 2016-09-22 16:12:17 +02:00
zmagod
303cb4308a fixes load comments [fixes SCI-471] 2016-09-22 13:46:27 +02:00
Oleksii Kriuchykhin
b334b037f8 Fixes issue with old data in modal fields [fixes SCI-400] 2016-09-22 10:54:03 +02:00
Matej Zrimšek
c614843044 Minor refactoring with hound alert fixes. 2016-09-21 19:48:18 +02:00
Matej Zrimšek
234918a76d Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
Matej Zrimšek
c6a23aab98 Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408] 2016-09-21 19:37:36 +02:00
zmagod
06b1992e94 Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436 2016-09-21 19:20:55 +02:00
zmagod
2bfe8f0636 fixing hound 2016-09-21 08:16:23 +02:00
zmagod
9f56df02d2 removes comment tab and add comment in the info tab [fixes SCI-436] 2016-09-20 18:53:51 +02:00
zmagod
42bbc47f5f first working version 2016-09-20 17:06:07 +02:00
zmagod
0ca65aeca5 fixed step comment sorting 2016-09-20 13:31:50 +02:00
zmagod
cd64e035c0 set form validations 2016-09-20 09:50:03 +02:00
zmagod
f48553e807 fixed ajax call 2016-09-19 16:12:07 +02:00
Oleksii Kriuchykhin
3f0a2c7dfc Fixes issue with too many " | " signs in error message [fixes SCI-459] 2016-09-19 13:53:24 +02:00
Matej Zrimšek
c2f0106993 Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408] 2016-09-16 15:56:44 +02:00
zmagod
938aa32190 js tweaks 2016-09-16 15:22:24 +02:00
zmagod
635f6b92d6 fixed comments display 2016-09-16 11:55:10 +02:00
zmagod
b9b466cd8e Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas 2016-09-16 09:28:19 +02:00
zmagod
e90f0bd3d5 refactor step view 2016-09-16 09:04:21 +02:00
Zmago Devetak
01656c1018 Merge pull request #153 from ZmagoD/zd_SCI_448 
Wrong name of experiment and task - gets undefined as prefix
 2016-09-15 15:00:34 +02:00
mlorb
587369e7a6 Merge pull request #152 from mlorb/ml_sci_428 
fixes responsiveness on mobile phone for sample view [SCI-428]
 2016-09-15 12:11:48 +02:00
zmagod
0a2ab57e28 styled new comments layout 2016-09-15 11:45:51 +02:00
zmagod
e3ae22763e removed comments tab in protocol step 2016-09-15 08:46:14 +02:00
Zmago Devetak
d0a180a1e8 Merge pull request #148 from ZmagoD/zd_SCI_342 
fixes sidebar expanded elements when adding new experiments
 2016-09-14 13:48:34 +02:00
Mojca Lorber
386cedda71 fixes hound again 2016-09-14 11:34:24 +02:00
Mojca Lorber
aba5305cd6 fixes hound 2016-09-14 11:24:19 +02:00
zmagod
c4fabdb67a clean unneeded Observer configurations 2016-09-14 11:16:42 +02:00
zmagod
e1d871dcdb clear undefind from experiment name and refactor sidebar in reports [fixes SCI-448] 2016-09-14 11:11:35 +02:00
Mojca Lorber
a9029e0928 fixes responsiveness on mobile phone for sample view 2016-09-14 11:08:40 +02:00
zmagod
65383f1824 fixes sidebar expanded elements when adding new experiments [fixes SCI-342] 2016-09-13 13:09:57 +02:00
Jure Grabnar
fa3515d2eb Add formulas to reports 2016-09-13 09:46:21 +02:00
Jure Grabnar
3b364be70b Add formulas to steps tables 2016-09-13 09:44:17 +02:00
Jure Grabnar
5c88bdeeae Add formulas for readonly results tables 2016-09-13 09:44:17 +02:00
Jure Grabnar
e096f936f9 Add formulas to results 2016-09-13 09:44:17 +02:00
Matej Zrimšek
af8ab3e081 Fixed step's checklist items editing (items not multiplying and new item insertion always at bottom) [fixes SCI-427]. Improved step/result comment GUI [SCI-446]. 2016-09-12 16:55:46 +02:00
Zmago Devetak
1368716aa0 Merge pull request #130 from ZmagoD/zd_SCI_348 
project overview - updating (or creating new) experiment details
 2016-09-08 12:49:35 +02:00
mlorb
f4029a04fd Merge pull request #142 from mlorb/ml_sci_415 
fixes navbar size when resizing window [SCI-415]
 2016-09-08 12:46:36 +02:00
Matej Zrimšek
6eca3661bf Some JS error refactoring and accordingly updated error rendering when experiment description is too long. 2016-09-08 12:43:31 +02:00
Mojca Lorber
4c66ca6f80 fixes navbar size when resizing window 2016-09-08 09:17:58 +02:00
Matej Zrimšek
b0ad6d0753 Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407]. 2016-09-06 23:26:00 +02:00
zmagod
daa144ce7c added missing bracket 2016-09-06 11:57:03 +02:00
zmagod
856d226946 fixed move experiment form error duplication 2016-09-06 11:48:56 +02:00
zmagod
a5a24c7610 clear unused variable 2016-09-06 11:46:28 +02:00
zmagod
b672d85405 fixed error message duplication 2016-09-06 11:46:28 +02:00
zmagod
b44a284b54 sets edit experiment validation 2016-09-06 11:46:28 +02:00
zmagod
9d469f9092 sets front end validation for new experiment modal [fixes SCI-348] 2016-09-06 11:44:03 +02:00
zmagod
de6c03a73b setup experiment modal input validation 2016-09-06 11:44:03 +02:00
Zmago Devetak
9440371f3f Merge pull request #131 from ZmagoD/zd_SCI_400 
Sets front end validation for experiment move action [fixes SCI-400]
 2016-09-06 11:39:38 +02:00
Zmago Devetak
1a19753df9 Merge pull request #128 from ZmagoD/zd_SCI_105 
Trim long words in reports [fixes SCI-105]
 2016-09-06 10:10:06 +02:00
zmagod
a7b6135b2f cleared console.log 2016-09-06 10:08:32 +02:00
Luka Murn
81883911c4 Merge pull request #132 from Ducz0r/lm-sci-228 
Updates to invite users to team modal window
 2016-09-05 15:53:15 +02:00
Luka Murn
1d8600b39f Fix bug when inviting existing users onto teams 
Closes SCI-228
 2016-09-05 14:52:56 +02:00
mz3944
50e0c26e89 Merge pull request #125 from mz3944/mz_removed_avatar_upload_popop_sci_399 
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
 2016-09-05 11:49:04 +02:00
zmagod
667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31:17 +02:00
Zmago Devetak
ea26a532e4 Merge pull request #126 from ZmagoD/zd_SCI_332 
By default all experiments should be collapsed
 2016-09-02 15:58:03 +02:00
zmagod
28fa00c30c trim long words in reports [fixes SCI-105] 2016-09-01 15:45:39 +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
5cb79f6282 Fix the default parameters in JS 
This was causing major issues in IE.
 2016-08-31 14:04:45 +02:00
zmagod
b05c3df4d3 adds toggle id only to elements with modules 2016-08-31 10:25:40 +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
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
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
77ec5bcff9 Reposition comment dropdowns horizontally if needed 
Closes SCI-258
 2016-08-30 11:39:50 +02:00
Luka Murn
4ee4c6caba Remove JS validator from step comments 2016-08-30 11:06:30 +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
zmagod
57c1707e81 fixes secondary navigation [fixes SCI-338] 2016-08-30 09:53:56 +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
Mojca Lorber
53cdbc2638 fixes notification when adding new sample 2016-08-29 13:45:54 +02:00
zmagod
5af9d10c6a fixes new task button after tutorial ends 2016-08-29 11:46:45 +02:00
zmagod
d886d05ccb Merge branch 'zd_SCI_338' 2016-08-26 16:32:49 +02:00
Matej Zrimšek
e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade 
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
 2016-08-26 11:13:40 +02:00
Zmago Devetak
0cfc758f43 Merge pull request #102 from ZmagoD/zd_SCI_336 
implement first time popup logic
 2016-08-26 09:19:36 +02:00
zmagod
b0bd92e3f4 fixed edit action 2016-08-26 09:17:55 +02:00
Matej Zrimšek
782d384e26 Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step). 2016-08-25 22:26:53 +02:00
Matej Zrimšek
04d9163ff6 Paperclip file spoofing corrected/modified. 2016-08-25 18:57:06 +02:00
zmagod
99976722a8 uncomment js file 2016-08-25 18:49:49 +02:00
zmagod
1738ca66d2 one-time introductory popup [fixes SCI-336] 2016-08-25 18:44:21 +02:00
Luka Murn
8018cff02e Merge pull request #103 from Ducz0r/bb_edit_delete_comments 
Edit&delete comments
 2016-08-25 17:18:48 +02:00
mlorb
b1218cb3d6 Merge pull request #59 from biosistemika/ml_sci_244 
fixes tutorial bug of inappropriate window [SCI-244]
 2016-08-25 17:16:45 +02:00
Luka Murn
b533b0aca6 Fix another minor bug 2016-08-25 17:15:53 +02:00
Luka Murn
7cd94e8b0d Fix a minor bug on canvas 2016-08-25 17:09:55 +02:00
Luka Murn
9cd99fc532 Display "no comments" if you delete the last comment 2016-08-25 17:01:30 +02:00
zmagod
7a47ff6bc5 fixed new task error 2016-08-25 15:30:32 +02:00
zmagod
8ff645fb89 disabled experiment dropdown actions 2016-08-25 15:16:51 +02:00
Zmago Devetak
b090fd8d5b Merge pull request #95 from ZmagoD/zd_SCI_374 
adds edit workflow link if no workflow [fixes SCI-374]
 2016-08-25 14:07:33 +02:00
Luka Murn
24dd25d9f5 Add edit/delete result comment functionality 
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
 2016-08-25 13:51:31 +02:00
Luka Murn
bac0455435 Add edit&delete functionality to step comments 
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
 2016-08-25 13:51:31 +02:00
Luka Murn
c92d016f65 Add edit&delete module/task comments functionality 
This required a minor fix of comments.js.
 2016-08-25 13:51:31 +02:00
Luka Murn
f0d9cb96fa Add edit project comments functionality 2016-08-25 13:51:30 +02:00
Luka Murn
15c0baeee8 Add delete project comment functionality 
This commit also removes the old code from @bberic.
 2016-08-25 13:51:30 +02:00
Luka Murn
5569a1e6d2 Revert 2 files that contained no changes 2016-08-25 13:51:30 +02:00
scibb
a76d82d188 delete and edit comments for projects, protocols, results, and workflow elements 2016-08-25 13:51:30 +02:00
zmagod
5fabe06b8d implement first time popup logic 2016-08-25 11:44:49 +02:00
zmagod
f515366d91 fixes workflowing after updating description, fixes canvas bug 2016-08-25 09:11:42 +02:00
zmagod
92bb3dda99 hide last next button 2016-08-25 08:46:11 +02:00
zmagod
dbdbff12eb add experiment level tutorial step [fixes SCI-338] 2016-08-24 19:03:58 +02:00
mlorb
2d90ad1a65 Merge pull request #88 from mlorb/ml_sci_362 
fixes tile size in edit canvas [SCI-362]
 2016-08-24 17:07:11 +02:00
Mojca Lorber
d04df349d5 fixes medium and small zoom 2016-08-24 14:18:12 +02:00
zmagod
9393a96302 adds edit workflow link if no workflow [fixes SCI-374] 2016-08-24 14:10:50 +02:00
Jure Grabnar
00da7efb44 Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' 
Conflicts:
	app/models/experiment.rb

SCI-328 #close
 2016-08-24 13:11:10 +02:00
Zmago Devetak
9dc7708b73 Merge pull request #85 from ZmagoD/zd_SCI_360 
fixes project overview style and add no description link [fixes SCI-360]
 2016-08-23 16:24:22 +02:00
Zmago Devetak
aa650bbc65 Merge pull request #82 from ZmagoD/zd_SCI_359 
Add plus button at the bottom of project overview page [fixes SCI-359]
 2016-08-23 16:23:20 +02:00
Zmago Devetak
65049692ea Merge pull request #78 from ZmagoD/zd_SCI_349 
updating thumbnail
 2016-08-23 16:22:07 +02:00
Mojca Lorber
ac68db97b9 fixes tile size in edit canvas 2016-08-23 13:33:10 +02:00
Jure Grabnar
027193f937 Add links for moving module groups 2016-08-23 10:09:25 +02:00
Jure Grabnar
358f2b1c47 Add moving for newly created modules 2016-08-23 10:00:34 +02:00
zmagod
03a3759cf5 fixes project overview style and add no description link [fixes SCI-360] 2016-08-23 08:52:53 +02:00
Jure Grabnar
667b7671a6 Add connections for moved workflows 2016-08-22 17:26:21 +02:00
zmagod
bb11999566 adds plus button at the bottom of project overview page [fixes SCI-359] 2016-08-22 15:22:05 +02:00
zmagod
d38f29d207 set ajax loading of experiments images [fixes SCI-349] 2016-08-22 11:29:19 +02:00
mlorb
ed1cd193ac Merge pull request #77 from mlorb/ml_sci_357 
fixes warning messages when loading a new protocol that is linked with repository [SCI-357]
 2016-08-22 08:56:36 +02:00
Jure Grabnar
5bb99adb25 Add frontend logic for moving workflows from canvas 2016-08-19 17:11:17 +02:00
zmagod
b86e67a0d6 refactor initProjectExperiment 2016-08-19 16:38:34 +02:00
Mojca Lorber
fb081be682 fixes warning messages when loading a new protocol that is linked with repository 2016-08-19 16:03:10 +02:00
zmagod
cac5033eba set ajax for workflow img 2016-08-19 15:36:12 +02:00
Jure Grabnar
80498260e5 Add backend for moving task from canvas 2016-08-19 13:53:43 +02:00
Mojca Lorber
51e0d53b12 remove code duplication 2016-08-19 13:08:35 +02:00
Mojca Lorber
571f5b60f3 fixes notifications appearance and disappearance and content adjustment 2016-08-19 10:48:43 +02:00
Mojca Lorber
5c77167388 update buttons 2016-08-18 16:47:16 +02:00
Mojca Lorber
5695842fe3 fixes notifications when creating sample types and groups 2016-08-18 16:05:15 +02:00
zmagod
072f816286 refactor restore_after_tutorial function 2016-08-18 08:55:40 +02:00
zmagod
f2ee5d73a0 fixed project tutorial bug 2016-08-18 08:53:34 +02:00
mlorb
36d24523b4 Merge pull request #61 from biosistemika/ml_sci_291 
fixes dissapearance of sample type/group when editing samlpe or adding new sample [SCI-291]
 2016-08-18 08:25:31 +02:00
Matej Zrimšek
e4a6a3944e Added deleting of files on S3 server when editing/removing a file. Some refactoring. 2016-08-17 18:13:35 +02:00
Matej Zrimšek
ccdccc5cf1 Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring. 2016-08-17 18:11:13 +02:00
Matej Zrimšek
c87ba5b45c Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page. 2016-08-17 18:10:32 +02:00
Matej Zrimšek
951cf67b3d A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring. 2016-08-17 18:08:21 +02:00
Matej Zrimšek
b70f49f4e0 Some additional refinements. 2016-08-17 18:00:04 +02:00
Matej Zrimšek
86880f0299 Additional changes, refactoring and improvements. 2016-08-17 17:57:54 +02:00
Matej Zrimšek
01aad1764c Some hotfixes to previous commit. Client-side file validation added (except file type validation). Some refactoring. 2016-08-17 17:54:45 +02:00
Matej Zrimšek
e2f94caa96 Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done. 2016-08-17 17:54:06 +02:00
Jure Grabnar
77f75fdeb6 Delete module from canvas when moving 2016-08-17 15:46:30 +02:00
Jure Grabnar
0cdea0b51a Add modal for moving task on canvas 2016-08-17 15:46:30 +02:00
Zmago Devetak
da735a51f4 Merge pull request #62 from ZmagoD/zd_SCI_318 
Zd sci 318
 2016-08-17 10:01:10 +02:00
zmagod
4293f9c267 Merge branch 'zd_SCI_271' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_271 2016-08-17 09:58:29 +02:00
zmagod
7abc8f3a90 Merge branch 'master' into experiment-level 2016-08-17 09:28:35 +02:00
zmagod
76dd4bc90a fixed protocol status bar [fixes SCI-318] 2016-08-16 10:47:23 +02:00
Mojca Lorber
7dc0c3672a fixes dissapearance of sample type/group when adding/editing new sample 2016-08-16 10:17:29 +02:00
Jure Grabnar
c16eed5e63 Add missing dropdown_actions.js 2016-08-16 09:48:19 +02:00
zmagod
5e647f62d5 changed import label [fixes SCI-317] 2016-08-16 09:34:04 +02:00
zmagod
852fe499fb clean up linked protocol 2016-08-12 16:31:40 +02:00
Mojca Lorber
e6f205368b fixes tutorial bug of inappropriate window 2016-08-12 11:33:27 +02:00
Jure Grabnar
555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +02:00
zmagod
701c26a2dd fixed canvas edit and samples tutorial [fixes: SCI-271] 2016-08-11 16:21:55 +02:00
zmagod
a128815122 fixed tutorial tasks on canvas 2016-08-11 16:06:51 +02:00
zmagod
2e1d81a985 fixed project archive in tutorial 2016-08-11 12:40:16 +02:00
Jure Grabnar
7f21ae138a Set clone actions/routes/view 
DRY code for showing AJAX on project#show page
 2016-08-11 09:46:15 +02:00
scibb
696075bf0f smaller grid steps set. In addition enddpoint bug was fixed 
SCI 170, SCI 292'
 2016-08-08 15:18:38 +02:00
jbargu
3f91e7a476 Merge pull request #47 from biosistemika/jg_explvl_reports 
Update reports with experiment level

[Fixes SCI-35].
 2016-08-08 08:51:23 +02:00
Jure Grabnar
cafec6a1b4 Fix controls on experiment contents 
Also fix bug with adjencent elements not updating controls.

Fixes SCI-35.
 2016-08-04 16:05:03 +02:00
zmagod
a4ec558596 start to implement project overview page 2016-08-04 12:57:33 +02:00
Jure Grabnar
da2a06c999 Fix global sort to work with experiments 2016-08-03 14:59:53 +02:00
Jure Grabnar
acc41dae40 Add experiment content report dialog 
Adding still has to be implemented
 2016-08-03 12:52:51 +02:00
zmagod
caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
zmagod
e95f518964 refactor canvas_controller, experiments_controller 2016-07-28 16:01:53 +02:00
zmagod
352944fc33 added new/edit experiment modals 2016-07-28 14:44:44 +02:00
Luka Murn
076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn
055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00