Zanz2
e7e37939a9
quick fix to expected result losing html
2017-11-24 11:18:12 +01:00
zmagod
65aee2630f
fix makefile
2017-11-24 09:56:04 +01:00
zmagod
6987261b53
disable pending cucumber tests
2017-11-24 09:52:13 +01:00
Zanz2
dc5904aed9
Fixed this jira issue and added workarounds for bugs
2017-11-24 01:45:40 +01:00
zmagod
6f8c97a686
remove rm container
2017-11-23 17:43:09 +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
zmagod
b5537e2dfc
change setup
2017-11-23 17:23:55 +01:00
zmagod
6d68135a70
adds mailer envs
2017-11-23 17:09:05 +01:00
zmagod
6d56377eb0
adds sleep time after Delayed::Worker.new.work_off
2017-11-23 16:57:30 +01:00
zmagod
331823c2fb
upgrade capybara_email gem
2017-11-23 16:27:49 +01:00
zmagod
dc51d328bc
removes make worker
2017-11-23 15:58:46 +01:00
zmagod
149f09da55
add workder to travic
2017-11-23 15:45:47 +01:00
zmagod
61be762b76
fix failing navigation spec
2017-11-23 15:30:08 +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
zmagod
930e3a86dc
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1762
2017-11-23 13:56:17 +01:00
Luka Murn
c51a85a161
Merge pull request #888 from biosistemika/lm-sci-1795
...
Setup main architecture for permissions refactoring [SCI-1795]
2017-11-23 12:32:49 +01:00
Luka Murn
00fe267a2a
Minor codestyle fixes
2017-11-23 11:33:39 +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
Zmago Devetak
2f66c1df25
adds travis config file ( #873 )
...
* adds travis config file
* add dist to travis
* adds script section
* test env
* remove globals
* adds hashed variables
* add matrix
* removed matrix
* test env
* testing
* test
* update Gemfile
* test travis
* test
* test
* test travis
* test
* build with docker
* test
* test
* ads
* add devise secre
* test travis
* test
* test
* test
* adds travis db configurations
* make travis happy
* test
* test
* test
* test
* test
* test
* testing devise
* test
* test
* teset
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* edit env
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* final commit
* test
* cleanup
* cleanup
2017-11-23 09:55:57 +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
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
