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 |
|
Zanz2
|
529d988cc3
|
closing html tags
|
2017-11-21 11:15:09 +01:00 |
|
Zanz2
|
d8c809ffd0
|
Reviewed pull request
|
2017-11-20 23:19:34 +01:00 |
|
Luka Murn
|
28cadb987e
|
Update revision of canaid Gem
|
2017-11-20 18:16:05 +01:00 |
|
zmagod
|
70db34090d
|
fixes rspec tests
|
2017-11-20 09:41:14 +01:00 |
|
Zanz2
|
e943df9176
|
fixed small rubocop error
|
2017-11-20 01:02:02 +01:00 |
|
Zanz2
|
cf66d94d45
|
Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields
|
2017-11-20 00:59:32 +01:00 |
|
Zanz2
|
99b16f339d
|
New maximums, functions reworked
|
2017-11-17 15:16:17 +01:00 |
|
Zanz2
|
a6009806c4
|
Fixed some oversights
|
2017-11-17 02:56:16 +01:00 |
|
Zanz2
|
fa25a6785b
|
Made the propper files and functionality for the text truncation to function
|
2017-11-17 02:43:32 +01:00 |
|
Zanz2
|
b2e1623cf1
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into validations_cutoff_SCI-1784
|
2017-11-16 20:04:12 +01:00 |
|
Zanz2
|
c44465817d
|
Added the functions and put in limitations from my validations files, changed controller name, added some locals
|
2017-11-16 20:03:44 +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 |
|
Luka Murn
|
d715eb06ef
|
Add team & project role-related helper functions to User model
This will be required later once we start using Canaid.
|
2017-11-16 15:50:30 +01:00 |
|
Luka Murn
|
ccef5571f1
|
Add dependency to Canaid, the permission helper library
|
2017-11-16 15:49:13 +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 |
|
Zmago Devetak
|
a2af2fcd7c
|
Merge pull request #885 from ZmagoD/zd_SCI_1817
fixes dependencies issue [fix SCI-1817]
|
2017-11-16 10:50:32 +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 |
|
zmagod
|
ed50466acd
|
fixes dependencies issue [fix SCI-1817]
|
2017-11-16 09:49:42 +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 |
|
Oleksii Kriuchykhin
|
84f4aba213
|
Pull latest master into gilson-iot-rails4
|
2017-11-15 15:15:26 +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 |
|
Zmago Devetak
|
fe128dc53b
|
Merge pull request #865 from ZmagoD/zd_SCI_1761
fixes password validations [fixes SCI-1761]
|
2017-11-13 13:09:46 +01:00 |
|