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

2638 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksii Kriuchykhin 8b11427780 Add allowed zip file type to Powerpoin and Word files [SCI-1916] 2018-01-11 15:17:30 +01:00
Luka Murn 660ee6af81
Update VERSION to 1.12.9 2018-01-10 10:53:20 +01:00
Zmago Devetak 4e4cae9a48
Merge pull request #927 from ZmagoD/zd_SCI_1867 
fix import protocol preview [fixes SCI-1867]
 2018-01-08 14:21:44 +01:00
zmagod 7af4816ce8 removes js brakepoint 2018-01-05 17:13:39 +01:00
Zmago Devetak a2280a4075
Merge pull request #924 from ZmagoD/tiny_mce_asset_nil_guard 
Nil image guard [fixes SCI-1907]
 2018-01-05 16:45:15 +01:00
zmagod 11e47bbfc3 follow @duco 's suggestions 2018-01-05 15:37:58 +01:00
zmagod 3fae267547 fix import protocol preview [fixes SCI-1867] 2018-01-05 15:30:11 +01:00
Zmago Devetak 151f8b828d
Merge pull request #925 from ZmagoD/zd_SCI_1870 
fixes bug with displaying assign/unassign button [fixes SCI-1870]
 2018-01-05 13:25:49 +01:00
zmagod 498f5eec13 add params to task so we can restart the script from the failed attempt in case it happens 2018-01-05 13:23:58 +01:00
zmagod 0d72851bb5 fixes bug with displaying assign/unassign button [fixes SCI-1870] 2018-01-04 17:20:17 +01:00
zmagod a87c43e999 nil image guard [fixes SCI-1907] 2018-01-04 14:49:52 +01:00
Luka Murn 7e2392f620
Update VERSION to 1.12.8 2018-01-04 08:33:33 +01:00
okriuchykhin 3d3b1d3a44
Merge pull request #921 from okriuchykhin/ok_SCI_1648 
Fix assign repository record button in tasks when one record is selected [SCI-1648]
 2018-01-03 16:28:34 +01:00
Oleksii Kriuchykhin 27008be50e Fix assign repository record button in tasks when one record is selected [SCI-1648] 2017-12-22 18:05:22 +01:00
okriuchykhin 0a6d0d1a47
Merge pull request #918 from okriuchykhin/ok_SCI_1893 
Fix invite users dropdown [SCI-1893]
 2017-12-22 16:58:49 +01:00
okriuchykhin 6fe7598b90
Merge pull request #919 from okriuchykhin/ok_SCI_1895 
Fix bootstrap select dropdown [SCI-1895][SCI-1896]
 2017-12-22 16:58:38 +01:00
okriuchykhin a31d616cf8
Merge pull request #920 from okriuchykhin/ok_SCI_1872 
Fix experiment workflow image update indicator [SCI-1872]
 2017-12-22 16:58:26 +01:00
Oleksii Kriuchykhin 917c2cf28e Fix experiment workflow image update indicator [SCI-1872] 2017-12-22 13:12:52 +01:00
Oleksii Kriuchykhin b98241ef61 Fix bootstrap select dropdown [SCI-1895][SCI-1896] 2017-12-22 09:52:00 +01:00
Oleksii Kriuchykhin afb579bef1 Fix invite users dropdown [SCI-1893] 2017-12-21 16:49:10 +01:00
Luka Murn 44f0336a96
Merge pull request #915 from biosistemika/lm-fix-wicked-pdf-version 
Fix Wicked PDF version
 2017-12-20 11:08:03 +01:00
Luka Murn 704bd31fef Set wicked_pdf version to ~> 1.0.6 2017-12-20 10:53:53 +01:00
okriuchykhin ee973bb3c1
Merge pull request #913 from okriuchykhin/ok_SCI_1891 
Remove Creek XLSX parser gem as it causes conflicts [SCI-1891]
 2017-12-19 16:34:53 +01:00
Oleksii Kriuchykhin 1a81a99ff0 Remove Creek XLSX parser gem as it causes conflicts [SCI-1891] 2017-12-19 16:17:11 +01:00
okriuchykhin 565fd07d05
Merge pull request #912 from okriuchykhin/ok_SCI_1891 
Fix gem dependencies [SCI-1891]
 2017-12-19 14:21:45 +01:00
Oleksii Kriuchykhin 99de5550b0 Fix gem dependencies [SCI-1891] 2017-12-19 14:18:29 +01:00
Luka Murn 49f9981a39 Remove uneccesary submodule include 2017-12-19 12:05:28 +01:00
Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
Adrian Oprea 7358022fa5
Merge pull request #909 from biosistemika/chore/add-EditorConfig 
chore: Add EditorConfig preference file
 2017-12-14 15:42:31 +02:00
Adrian Oprea 20eb9f643f chore: Add EditorConfig preference file 
EditorConfig is a tool (editor extension) that allows developers to
configure the indent style / size for various files in the codebase.
It is useful to uniformly introduce spacing for various filetypes.
In our case it is used for .js/.jsx and .rb files to keep indents
consistent. It is also configured to insert a final new line on every
file we create/edit. This is helpful for Git Diffs.

Learn more about EditorConfig: http://editorconfig.org/

Learn more about the history behind new lines at EOF:

- https://robots.thoughtbot.com/no-newline-at-end-of-file
- https://unix.stackexchange.com/questions/18743/whats-the-point-in-adding-a-new-line-to-the-end-of-a-file
- https://stackoverflow.com/questions/5813311/no-newline-at-end-of-file

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2017-12-14 10:34:12 +02:00
Zmago Devetak 00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step 
Fixes bug with embedded images [SCI-1624]
 2017-12-12 09:53:24 +01:00
Zanz2 306ae51a4c
Merge pull request #904 from Zanz2/buttons_design_SCI-1809 
Made scrolling possible at most zoom levels in protocols.io import preview [SCI-1809]
 2017-12-11 21:16:40 +01:00
Zanz2 1fc8b2a2b2 quick fix un-needed styling 2017-12-10 01:45:47 +01:00
Zanz2 11dc3be9d4 It is now possible to scroll down preview modal 2017-12-10 01:41:21 +01:00
Zanz2 d0a9198408 Fixed the styling 2017-12-10 01:20:08 +01:00
okriuchykhin b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747 
Improve server side assets validation display for steps [SCI-1747]
 2017-12-04 14:12:43 +01:00
Zmago Devetak 205d3b3d8f
Merge pull request #894 from ZmagoD/zd_SCI_1650 
Adds task to copy images [fixes SCI-1650]
 2017-12-01 17:32:09 +01:00
Oleksii Kriuchykhin 373d7e8aa6 Clear selected files after successful upload [SCI-1747] 2017-12-01 11:51:22 +01:00
okriuchykhin e54bfba8fd
Merge pull request #897 from okriuchykhin/ok_SCI_1845 
Update Rails version to 4.2.10 [SCI-1845]
 2017-11-30 16:20:55 +01:00
Oleksii Kriuchykhin 9408b29768 Update Rails version to 4.2.10 [SCI-1845] 2017-11-29 16:49:50 +01:00
Luka Murn 92b665253f
Bump version to 1.12.7 2017-11-29 10:36:05 +01:00
Oleksii Kriuchykhin 745dac09a7 Improve clean-up of dropped files [SCI-1747] 2017-11-28 16:48:47 +01:00
zmagod 7442684846 fix protocol preview, remove unneeded functions, fix copy paste tokens 2017-11-28 14:16:20 +01:00
Oleksii Kriuchykhin e35031dd9a Small code fixies [SCI-1747] 2017-11-28 11:34:57 +01:00
zmagod e233fbe1d8 fix image removing from tinymce 2017-11-28 11:01:07 +01:00
zmagod dec1e53b53 fix banana 2017-11-28 10:09:06 +01:00
Zanz2 bb8aef3b73
Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833 
Fixed validations lengths and added workarounds for bugs [SCI-1833]
 2017-11-24 17:55:20 +01:00
zmagod e69e9f6794 remove unneeded comment and add tiny_mce_asset regex in a constant 2017-11-24 17:04:01 +01:00
zmagod 066c782cd2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step 2017-11-24 16:29:32 +01:00
Zmago Devetak 027f4a5921
Merge pull request #890 from ZmagoD/zd_SCI_1651 
export and import RTE images
 2017-11-24 16:28:28 +01:00