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
14594 commits 31 branches 181 tags 167 MiB
Commit graph

14594 commits

This branch
This branch
All branches
Author SHA1 Message Date
zmagod
2031c42920 fixed confirmation text 2016-08-26 09:13:45 +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
Zmago Devetak
1b21e55fea Merge pull request #100 from ZmagoD/zd_SCI_381 
Adds experiment and team to tag search resuls [fixes SCI-381]
 2016-08-25 15:43:50 +02:00
zmagod
cd6780775c removed a sentence from canvas_overview_html 2016-08-25 15:35:37 +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
a480c8d403 Styling fixes 2016-08-25 13:59:50 +02:00
Luka Murn
6d86a02d7c Add individual permission checks in dropdowns 
Closes SCI-258.
 2016-08-25 13:51:50 +02:00
Luka Murn
8592c13ed4 Remove now obsolote controller actions 2016-08-25 13:51:31 +02:00
Luka Murn
b0d7b9dc75 Generate activities when editing/deleting comments 2016-08-25 13:51:31 +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
512efd3812 Fix 2 lines that were too long 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
9e3bb8edb7 Add dependant: :destroy to comments 2016-08-25 13:51:30 +02:00
Luka Murn
8a73a3ab5c Update permission_helper.rb and routes.rb 2016-08-25 13:51:30 +02:00
Luka Murn
ff9bb17912 Update routes.rb 2016-08-25 13:51:30 +02:00
Luka Murn
319bcc7850 Add permissions for comments to permission_helper.rb 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
mlorb
4c0765a47e Merge pull request #101 from mlorb/ml_sci_388 
change position of overview and samples [SCI-388]
 2016-08-25 13:02:20 +02:00
zmagod
5fabe06b8d implement first time popup logic 2016-08-25 11:44:49 +02:00
Mojca Lorber
4a5d720724 change position of overview and samples 2016-08-25 11:19:53 +02:00
zmagod
1120ef1407 adds experiment and team to tag search resuls [fixes SCI-381] 2016-08-25 10:40:03 +02:00
mlorb
c38a4e2614 Merge pull request #94 from mlorb/ml_sci_375 
add move experiment instructions [SCI-375]
 2016-08-25 09:45:16 +02:00
Luka Murn
c082bceafc Merge pull request #98 from Ducz0r/lm-sci-385 
Fix bug with linked tasks
 2016-08-25 09:29:50 +02:00
zmagod
f515366d91 fixes workflowing after updating description, fixes canvas bug 2016-08-25 09:11:42 +02:00
mlorb
0a066f436f Merge pull request #96 from mlorb/ml_sci_369 
buttons update on experiment overview [SCI-369]
 2016-08-25 08:54:16 +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
Luka Murn
77d69b4662 Merge pull request #97 from mlorb/ml_sci_387 
replace description in add content to report window [SCI-387]
 2016-08-24 18:40:30 +02:00
Luka Murn
3dddffaa34 Fix bug with linked tasks 
This bug was a legacy of experiment level introduction.
Closes SCI-385, SCI-366.
 2016-08-24 17:22:16 +02:00
Mojca Lorber
408af14e41 replace description in add content to report window 2016-08-24 17:19:29 +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
2a897432e1 update buttons on canvas view 2016-08-24 17:00:27 +02:00
jbargu
5c104ac050 Merge pull request #93 from jbargu/jg_sci_378_move_experiment_error 
Fix 404 move experiment error
 2016-08-24 16:35:29 +02:00
Mojca Lorber
d04df349d5 fixes medium and small zoom 2016-08-24 14:18:12 +02:00
Zmago Devetak
0de7ea31ea Merge pull request #90 from ZmagoD/zd_SCI_376 
fixes cloned experiment protocol [fixes SCI-376]
 2016-08-24 14:12:19 +02:00
zmagod
9393a96302 adds edit workflow link if no workflow [fixes SCI-374] 2016-08-24 14:10:50 +02:00