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

158 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 2c9ced0c75 Fix step numbering update on reposition [SCI-3507] 2019-05-29 12:20:35 +02:00
aignatov-bio fb30e6b6e5
Add check for refreshProtocolStatusBar function exist (#1794) 2019-05-22 10:31:29 +02:00
mlorb be0393e642
Merge pull request #1785 from biosistemika/lm-ml-sci-3193 
Update protocol status bar upon protocol changing [SCI-3193]
 2019-05-21 15:28:58 +02:00
Mojca Lorber b479a6a145 Cover all use cases for updating protocol status bar 2019-05-20 16:09:43 +02:00
aignatov-bio 20b626d791
Fix warning message issue in step description [SCI-3479] (#1778) 
* Fix warning message issue
 2019-05-20 11:19:53 +02:00
aignatov-bio 3633274c8f
Fix import for eln (#1741) 2019-05-13 10:22:30 +02:00
Miha Mencin 0a7696200a
Merge pull request #1732 from aignatov-bio/ai-sci-3413-tinymce-step-not-loading 
Clear step edit textarea status before going to edit mode [SCI-3413]
 2019-05-07 16:36:04 +02:00
Anton Ignatov ea545801aa Clear edit textarea status before going to editmode 2019-05-07 15:54:32 +02:00
Mojca Lorber 46e8f80965 Fix bug when saving empty step description 2019-05-06 17:14:19 +02:00
aignatov-bio cc8a152278
Fix step attachments sorting (#1718) 2019-05-06 09:56:26 +02:00
aignatov-bio 84993ea3ef
Update protocol repository for new description format [SCI-3371] (#1689) 
* Update protocol repository for new description format

* move image clone method to concerns
 2019-04-24 13:34:56 +02:00
Urban Rotnik 11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio 6b45dcd475
Update eln export for new tinyMCE image format (#1680) 2019-04-19 14:44:40 +02:00
Urban Rotnik ee3dc571e1 Update attachments view, add ordering on FE 2019-04-09 14:17:40 +02:00
Jure Grabnar 613843d095 Temp commit 2019-04-04 16:58:55 +02:00
Oleksii Kriuchykhin ffa7c5ecb2 Fix permition checks for file editing and make protocol preview files read only [SCI-3281] 2019-04-02 16:38:53 +02:00
Jure Grabnar 171b2eeedc Remove the title of protocol steps when empty 
Closes SCI-3072
 2019-03-25 09:36:56 +01:00
Oleksii Kriuchykhin eb3d1ea6fe Update RTE for step description [SCI-3111] 2019-03-19 17:42:49 +01:00
Oleksii Kriuchykhin 2ff5199be0 Fix TinyMCE images in protocol import [SCI-3030] 2019-02-07 16:58:38 +01:00
mz3944 f6c8af105d
Merge pull request #1434 from mz3944/mz-SCI-2903 
Fix (unite) Date and Time display formats [SCI-2903]
 2019-01-21 09:50:34 +01:00
Jure Grabnar fe46f9c9fe Reinit tooltips after cancel/save step 
Closes SCI-2891.
 2019-01-08 15:36:44 +01:00
Matej Zrimšek 8070b7f8b5 Fix Date and Time display formats on JS side 2019-01-08 08:07:24 +01:00
mlorb 2246166107 fix protocol link tooltip again 2018-12-07 12:00:42 +01:00
mlorb 7d1817350a fix missing protocols link tooltip 2018-12-04 10:45:16 +01:00
Oleksii Kriuchykhin 2e00f1546a Fix handsontable initialization [SCI-2882] 2018-11-26 14:11:46 +01:00
Matej Zrimšek 716e74ceb4 Fix DataTable display for protocol modal [SCI-2863] 2018-11-19 07:21:29 +01:00
mlorb e5fca1b1cd change the rich text max limit on frontend to 50000 2018-10-18 14:22:15 +02:00
Zanz2 16f9728a05 fixed to not use gon gem 2018-09-28 14:26:05 +02:00
Zanz2 c6936bc71e fixed the implementation according to PR review, now validates all table names, when multiple are present, and uses gon gem 2018-09-28 13:13:25 +02:00
Zanz2 7d093fa11d Fixed the issue, tested for all 3 reported scenarios 2018-08-31 11:18:18 +02:00
Zanz2 67f4555584 Fixed the issue, tested all 3 scenarios 2018-08-31 11:04:20 +02:00
Zanz2 27e0d27862
Merge pull request #1248 from Zanz2/zz_checklist_duplicates_bug_sci_1621 
Fixes duplicate checkbox entries in activity log [SCI-1621]
 2018-08-09 11:50:34 +02:00
Oleksii Kriuchykhin 8f5d30ad1f Fix load protocol modal [SCI-2253] 2018-08-02 14:35:19 +02:00
Oleksii Kriuchykhin b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin 6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
Zanz2 c6ef14290a Fixes too many events getting bound to a onclick event, by removing them before attaching the event listener again 2018-07-17 11:41:42 +02:00
Oleksii Kriuchykhin a169639b3c Fix uploaded file max size validation in JS [SCI-2590] 2018-07-05 15:23:26 +02:00
zmagod db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +02:00
mlorb c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
mlorb 81392362ac Final button colour changes 2018-05-18 16:24:24 +02:00
mlorb 06ce285ae2 add locales 2018-05-16 14:32:15 +02:00
Zmago Devetak 9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321 
fixes images preview in repository/library [fixes SCI-2321]
 2018-05-16 12:05:33 +02:00
mlorb 7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
zmagod 0afe461962 fixes download link 2018-04-26 17:00:51 +02:00
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00
mlorb 4bf9369bc5 refactor buttons 2018-03-29 13:58:14 +02:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
zmagod 7af4816ce8 removes js brakepoint 2018-01-05 17:13:39 +01:00
zmagod 3fae267547 fix import protocol preview [fixes SCI-1867] 2018-01-05 15:30:11 +01:00