scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
4735 commits 70 branches 179 tags 165 MiB
Commit graph

50 commits

Author SHA1 Message Date
Alex Kriuchykhin 75a48291e1
Merge pull request #1272 from okriuchykhin/ok_SCI_2654 
Fix report elements sorting [SCI-2654]
 2018-08-22 14:20:54 +02:00
Oleksii Kriuchykhin 62d99a4372 Fix report elements sorting [SCI-2654] 2018-08-20 14:46:23 +02:00
Zanz2 dfcaa40f1a
Merge branch 'master' into zz_refactor_icons_sci_2445_v2 2018-08-14 13:33:43 +02:00
Zanz2 45a4c1c598 changed the icons as per last comment in jira issue 2018-08-14 13:26:48 +02:00
Oleksii Kriuchykhin 6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
Oleksii Kriuchykhin 13c374d9b3 Add hooks to new report modal [SCI-2377] 2018-06-14 15:26:06 +02:00
Luka Murn e0a3b5a941 Fix Save PDF to repository modal window 2018-06-06 16:29:07 +02:00
Luka Murn c76b926387
Delete _report_sidebar.html.erb 
This file is no longer needed from my research.
 2018-05-25 11:04:05 +02:00
zmagod 06f1daf7a9 rename data-hook 2018-05-24 16:02:56 +02:00
zmagod e97a98f189 adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372] 2018-05-22 14:18:40 +02:00
zmagod e019767e90 refactor save_pdf_to_inventory_item service 2018-05-17 13:17:19 +02:00
zmagod ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
zmagod 4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +02:00
mlorb d2c0ae241e
Merge pull request #1121 from mlorb/ml-sci-2244 
Update buttons positions and wording throughout app [SCI-2244]
 2018-05-03 11:05:15 +02:00
mlorb 9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
zmagod 503ad1ba20 removes samples from views [fixes SCI-2304] 2018-04-24 08:26:55 +02:00
zmagod e96b690a5b removes reports link from secondary navigation, fix bug with turbolinks 2018-04-20 11:57:52 +02:00
mlorb cc34376253 update reports show page to work with new navigation 2018-04-18 14:40:53 +02:00
mlorb bc06542ed7 refactor project navigation 2018-03-22 11:41:33 +01:00
mlorb a0b2d3f5ef refactor read_team permission 2017-12-14 14:18:14 +01:00
Luka Murn b5f6d1da94 Allow custom repositories to be added to reports 2017-06-07 16:54:32 +02:00
mz3944 6b8c8deb16 Merge pull request #634 from mz3944/mz-SCI-414 
Uncompleted steps not added to Reports
 2017-05-23 09:58:05 +02:00
Matej Zrimšek 20265ddd69 Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487] 2017-05-17 18:18:57 +02:00
Matej Zrimšek f78c80b148 Added possibility to add uncompleted steps to report. [closes SCI-414] 2017-05-17 13:25:21 +02:00
Matej Zrimšek 2c6f888cbc Replace present? with more efficient exitst? for report content adding modal. [fixes SCI-487] 2017-05-15 18:56:41 +02:00
Matej Zrimšek 901558c733 Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek ba693c65a8 Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek dbb79ebab1 Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
Matej Zrimšek b97cb91840 Refactoring of modal for adding content to report. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
Matej Zrimšek 27cfd55ea5 Simplified popup modal for adding contents to report. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
Matej Zrimšek a5cffd06f3 Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719] 2017-04-25 16:03:50 +02:00
zmagod 72e13beee3 renamed organizations in views 2017-01-25 12:01:23 +01:00
Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master' 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
 2016-11-17 16:39:33 +01:00
Matej Zrimšek c8eb82cc85 Fixed tutorial step numbers and changed getting next page reference on protocols page. 2016-11-17 14:46:04 +01:00
Matej Zrimšek c64146904a Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count. 2016-11-17 14:46:04 +01:00
Luka Murn a3bbf94643 Add a smart_text_area tag & implement it throughout application 
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
 2016-11-16 17:57:01 +01:00
Oleksii Kriuchykhin d2e29935cf Improved tutorial styling [SCI-685] 2016-11-16 15:44:06 +01:00
Oleksii Kriuchykhin b9f982ead7 Additional steps added to tutorial and numbering of the steps fixed [SCI-571] 2016-11-11 10:07:34 +01:00
Jure Grabnar 9f7df0af76 Fix checkbox in experiment reports 2016-08-09 13:13:50 +02:00
Jure Grabnar 208e85e7e0 Remove archived experiments from reports 2016-08-09 11:17:25 +02:00
Jure Grabnar ff081cd844 Simplify project contents dialog 2016-08-03 12:52:51 +02:00
Jure Grabnar dc82830a8f Add checkbox behaviour to experiment contents 2016-08-03 12:52:51 +02:00
Jure Grabnar 3f33ebe59a Fix wrong closure in experiment contents 2016-08-03 12:52:51 +02:00
Jure Grabnar acc41dae40 Add experiment content report dialog 
Adding still has to be implemented
 2016-08-03 12:52:51 +02:00
Jure Grabnar ac708e7497 Remove no module group from reports 2016-08-03 12:52:06 +02:00
Jure Grabnar 797685fbf0 Remove workflows from project content dialog (report) 2016-08-03 12:52:06 +02:00
Jure Grabnar daca739262 Add new line to selector for readability 2016-08-03 12:52:06 +02:00
Jure Grabnar 598c5a63fd Add experiment level to project report contents modal 2016-08-03 12:52:05 +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