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

2619 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zmagod b6c0d352bd Adds task to copy images [fixes SCI-1650] 2017-11-24 16:25:12 +01:00
Zmago Devetak 728f656472
update protocols_exporter.rb 2017-11-24 15:23:19 +01:00
Zmago Devetak 3cd7e6fdde
fix open method 2017-11-24 15:19:58 +01:00
Zanz2 0e574b2f15 removed un needed limits 2017-11-24 11:49:57 +01:00
zmagod d200e355ed follow @Ducz0r 's suggestions 2017-11-24 11:45:07 +01:00
Zanz2 e7e37939a9 quick fix to expected result losing html 2017-11-24 11:18:12 +01:00
Zanz2 dc5904aed9 Fixed this jira issue and added workarounds for bugs 2017-11-24 01:45:40 +01:00
mlorb 9e7b75a880
Merge pull request #892 from mlorb/ml-sci-1215_v2 
Make background gray for paperclip images [SCI-1215]
 2017-11-23 17:32:09 +01:00
Mojca Lorber 0ffe476a54 make background gray for paperclip images 2017-11-23 14:35:42 +01:00
mlorb c46d630f0b
Merge pull request #891 from mlorb/ml-sci-1617 
Add copying of TinyMce assets when cloning the protocol [SCI-1617]
 2017-11-23 14:31:29 +01:00
Zanz2 b9fe2fa426
Merge pull request #886 from Zanz2/validations_cutoff_SCI-1784 
Added text field validations for various text fields  [SCI-1784]
 2017-11-23 10:07:27 +01:00
Zanz2 764e5259d1 Fixed last review, and a bug i found 2017-11-22 23:38:22 +01:00
Mojca Lorber fe5828fa97 add copying of TinyMce assets when cloning the protocol 2017-11-22 16:47:21 +01:00
zmagod afbeafb137 adds RTE images import, disables turbolinks on edit step actions 2017-11-22 16:28:14 +01:00
Zanz2 692ed62d6d made case statement nicer 2017-11-21 21:27:19 +01:00
Zanz2 f577bf93b5 Fixed pull request review 2017-11-21 19:20:15 +01:00
zmagod 91fec89cab adds tiny_mce_assets to protocol export 2017-11-21 16:30:48 +01:00
Oleksii Kriuchykhin fe8b7d26c1 Improve server side assets validation display for steps [SCI-1747] 2017-11-21 13:48:06 +01:00
Zanz2 8226322e92 Fixed open html tags on truncate 2017-11-21 11:42:42 +01:00