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 |
|
zmagod
|
d200e355ed
|
follow @Ducz0r 's suggestions
|
2017-11-24 11:45:07 +01:00 |
|
zmagod
|
afbeafb137
|
adds RTE images import, disables turbolinks on edit step actions
|
2017-11-22 16:28:14 +01:00 |
|
zmagod
|
91fec89cab
|
adds tiny_mce_assets to protocol export
|
2017-11-21 16:30:48 +01:00 |
|
Zanz2
|
038c15a1ee
|
Merge pull request #884 from Zanz2/size_limit_small_SCI-1810
Fixed; compared file size in wrong units [SCI-1810]
|
2017-11-16 18:11:09 +01:00 |
|
Zanz2
|
1b540a75a1
|
Fixed to use .megabytes
|
2017-11-16 15:17:13 +01:00 |
|
Zanz2
|
e782f13a7d
|
Merge branch 'master' of github.com:Zanz2/scinote-web into size_limit_small_SCI-1810
|
2017-11-16 15:14:01 +01:00 |
|
okriuchykhin
|
42f2d7e685
|
Merge pull request #883 from okriuchykhin/ok_SCI_1819
Allow import of the sample with missing non mandatory fields [SCI-1819]
|
2017-11-16 11:03:08 +01:00 |
|
mlorb
|
6c80c338e4
|
Merge pull request #880 from mlorb/ml-sci-1316
Change text for avatar size on my profile page [SCI-1316]
|
2017-11-16 10:43:23 +01:00 |
|
mlorb
|
68597fd1a1
|
Merge pull request #881 from mlorb/ml-sci-1317
Change text for expiry of a link for an exported file [SCI-1317]
|
2017-11-16 10:43:05 +01:00 |
|
Zanz2
|
41c1193a78
|
Fixed unit error;Now when comparing file size, both are in bytes
|
2017-11-16 01:34:38 +01:00 |
|
Zanz2
|
4d65ad59fe
|
Merge pull request #878 from Zanz2/protocol_description_fix
Found a bug; i forot to include protocol description in new preview modal
|
2017-11-16 01:11:52 +01:00 |
|
Oleksii Kriuchykhin
|
f202687291
|
Allow import of the sample with missing non mandatory fields [SCI-1819]
|
2017-11-15 16:40:14 +01:00 |
|
Mojca Lorber
|
cd006c2640
|
change text for expiry of a link for an exported file
|
2017-11-15 14:32:19 +01:00 |
|
Mojca Lorber
|
ff998a6c98
|
change text for avatar size on my profile page
|
2017-11-15 14:21:04 +01:00 |
|
mlorb
|
47784e09a8
|
Merge pull request #867 from mlorb/ml-sci-1434
Add explanation when copying custom repositories [SCI-1434]
|
2017-11-15 11:34:02 +01:00 |
|
mlorb
|
06fc0eac5e
|
Merge pull request #868 from mlorb/ml-sci-1215
Fix preview for images with transparent background [SCI-1215]
|
2017-11-15 11:28:57 +01:00 |
|
mlorb
|
288e3ddcbd
|
Merge pull request #877 from mlorb/ml-sci-1190
Fix bug when removing all keywords in protocol [SCI-1190]
|
2017-11-15 11:22:18 +01:00 |
|
Zanz2
|
c3f6c2b34a
|
Found a bug where i forot to include protocol description in preview modal and fixed it
|
2017-11-14 19:46:51 +01:00 |
|
Zanz2
|
bc00c4a28b
|
Merge pull request #874 from Zanz2/supported_file_1794
Made button green and added .json to supported file [SCI-1794]
|
2017-11-14 19:12:45 +01:00 |
|
Zanz2
|
9bd198eaf6
|
Merge pull request #875 from Zanz2/removed_txt_1793
Removed the .txt text from translations file [SCI-1793]
|
2017-11-14 19:12:32 +01:00 |
|
Zanz2
|
6cd2c6f518
|
Merge pull request #876 from Zanz2/valid_format_1791
Made validations for JSON format and .txt and .json files [SCI-1791]
|
2017-11-14 19:12:16 +01:00 |
|
Mojca Lorber
|
c2a5b52767
|
fix bug when removing all keywords in protocol
|
2017-11-14 15:04:37 +01:00 |
|
Zanz2
|
6b9a10ffe4
|
Made validations for JSON format and .txt and .json files
|
2017-11-14 12:02:17 +01:00 |
|
Zanz2
|
7ec8d7c2b2
|
Made button green and added .json to supported file
|
2017-11-14 11:46:19 +01:00 |
|
Zanz2
|
3e964da241
|
Removed the .txt text from translations file
|
2017-11-14 11:42:10 +01:00 |
|
Zanz2
|
8ba27f734e
|
Merge pull request #869 from Zanz2/Tables_and_protocol_info_integration
Made the two seperate branches from previous jira issues work together (fixed a small bug)
|
2017-11-14 11:26:48 +01:00 |
|
Zanz2
|
f35ab78849
|
Added some code to make the two seperate jira issues work together (protocol info and scinote tables
|
2017-11-14 00:56:39 +01:00 |
|
Mojca Lorber
|
f75a2710d5
|
fix preview for images with transparent background
|
2017-11-13 18:03:14 +01:00 |
|
Mojca Lorber
|
be74338d9f
|
add explanation when copying custom repositories
|
2017-11-13 16:30:42 +01:00 |
|
mlorb
|
cd6799d571
|
Merge pull request #866 from biosistemika/protocols-io-import
Protocols io import
|
2017-11-13 11:53:28 +01:00 |
|
Zanz2
|
b265beb386
|
Merge pull request #864 from Zanz2/move_desc
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
|
2017-11-13 10:07:01 +01:00 |
|
Zanz2
|
4750d6f270
|
Merge pull request #862 from Zanz2/move_tablev2
Protocols.io converted html tables to scinote table elements [SCI-1692]
|
2017-11-13 10:06:21 +01:00 |
|
Zanz2
|
23d3ffa5a4
|
Fixed PR
|
2017-11-12 15:48:45 +01:00 |
|
Zanz2
|
e26adc2905
|
Quick formatting fix
|
2017-11-12 15:41:50 +01:00 |
|
Zanz2
|
e7384ac38d
|
Code review fixes, made seperate helper file
|
2017-11-12 15:31:04 +01:00 |
|
Zanz2
|
fa2c0fe556
|
merging
|
2017-11-09 18:55:17 +01:00 |
|
Zanz2
|
812fa3f1d5
|
Hopefully this will resolve my merge problems
|
2017-11-09 17:42:17 +01:00 |
|
Zanz2
|
a40a63ae50
|
Made code more aesthetic
|
2017-11-09 15:38:06 +01:00 |
|
Zanz2
|
60da9d136c
|
Merge pull request #859 from Zanz2/p_succ_msg_SCI-1694
Protocols.io import success flash messagge [SCI-1694]
|
2017-11-09 15:23:47 +01:00 |
|
Zmago Devetak
|
26260d01fd
|
Merge pull request #856 from ZmagoD/zd_SCI_1610
trigger an alert to on canvas save if page reload [fixes SCI-1610]
|
2017-11-09 11:35:39 +01:00 |
|
Zanz2
|
518eb09110
|
Deleted un needed error flash
|
2017-11-09 10:49:44 +01:00 |
|
Zanz2
|
4b837dbe9d
|
Forgot flash fail messagges, now added them for file too big and general error
|
2017-11-09 10:49:44 +01:00 |
|
Zanz2
|
feb686b4ac
|
Fixed alignement
|
2017-11-09 10:49:44 +01:00 |
|
Zanz2
|
8b247770ef
|
Added the success flash alert
|
2017-11-09 10:49:44 +01:00 |
|
Zanz2
|
9086cd8b6b
|
Jira branch code
|
2017-11-09 10:49:44 +01:00 |
|
zmagod
|
f43492adff
|
trigger an alert to on canvas save if page reload [fixes SCI-1610]
|
2017-11-07 15:08:26 +01:00 |
|
Luka Murn
|
09ac0febbb
|
Bump version to 1.12.6
|
2017-11-07 12:48:53 +01:00 |
|
Zmago Devetak
|
a9bba07c74
|
Merge pull request #847 from ZmagoD/zd_SCI_1683
add whacamole configuration [fixes SCI-1683]
|
2017-11-06 15:56:29 +01:00 |
|