okriuchykhin
9ed73702c5
Merge pull request #896 from okriuchykhin/ok_SCI_1837
...
Fix Ajax calls with redirect [SCI-1837]
2017-11-30 11:00:26 +01:00
okriuchykhin
7dfaab82bb
Merge pull request #895 from okriuchykhin/ok_SCI_1840
...
Add initialization of the selectpicker on experiments actions [SCI-1840]
2017-11-30 10:56:07 +01:00
Oleksii Kriuchykhin
194054d973
Fix assignment of users to projects [SCI-1838]
2017-11-29 22:55:10 +01:00
Oleksii Kriuchykhin
9408b29768
Update Rails version to 4.2.10 [SCI-1845]
2017-11-29 16:49:50 +01:00
Oleksii Kriuchykhin
7bb52191cd
Fix Ajax calls with redirect [SCI-1837]
2017-11-29 16:13:28 +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
Oleksii Kriuchykhin
6964ed2dbb
Add initialization of the selectpicker on experiments actions [SCI-1840]
2017-11-28 16:34:30 +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
Zmago Devetak
215fa9d0b0
Merge pull request #887 from ZmagoD/zd_SCI_1762
...
fixes rspec tests
2017-11-24 11:48:39 +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
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
