Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop branch #10

Closed
wants to merge 11 commits into from
Closed

Develop branch #10

wants to merge 11 commits into from

Conversation

bwl21
Copy link

@bwl21 bwl21 commented Nov 27, 2015

I have crated a development branch. If you merge this, #9 and #7 are included.

Updated readme.md accordingly.
Ignore generated files in this repository.
* absolute paths
* cleanup computation of urls and server internal paths
* feature/Integrate_Inlinestyle:
  Added <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> see voidlabs/mosaico#56
  Integrate https://github.com/christiaan/InlineStyle Updated readme.md accordingly. Ignore generated files in this repository.
* feature/fix_image_handling:
  fix image handling * absolute paths * cleanup computation of urls and server internal paths
* feature/fix_image_handling:
  cherry picked some changes to make this branch work

Conflicts: resolved
	.gitignore
@bwl21 bwl21 mentioned this pull request Dec 2, 2015
bwl21 added 4 commits December 9, 2015 16:28
* commit 'ea2e126298fabbb86b69079e4207bde1110719c6':
  Update README.md
  Refactor code and improve url and file system pathing

Conflicts:
	README.md
	config.php
	dl/index.php
	upload/index.php
Integrated InlineStyle
Followed the layout in uSked#11

needs installation specific adaption of .htaccess
@bwl21
Copy link
Author

bwl21 commented Dec 9, 2015

I close this pull request. It was not considered by ainterpreting and is now out of date

@bwl21 bwl21 closed this Dec 9, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant