nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'WebSpider-remove_s3_dependency' into develop

Browse source
This commit is contained in:
Jonne Haß 2013-09-14 20:16:28 +02:00
commit f76f35c097
6 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -18,6 +18,7 @@
* Make I18n system more robust against missing keys in pluralization data * Make I18n system more robust against missing keys in pluralization data
* Prevent overflow of too long strings in the single post view [#4487](https://github.com/diaspora/diaspora/pull/4487) * Prevent overflow of too long strings in the single post view [#4487](https://github.com/diaspora/diaspora/pull/4487)
* Disable submit button in sign up form after submission to avoid email already exists error [#4506](https://github.com/diaspora/diaspora/issues/4506) * Disable submit button in sign up form after submission to avoid email already exists error [#4506](https://github.com/diaspora/diaspora/issues/4506)
* Do not pull the 404 pages assets from Amazon S3 [#4501](https://github.com/diaspora/diaspora/pull/4501)
## Features ## Features
* Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353) * Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)

8
public/404.html
View file

@ -3,8 +3,8 @@
<head> <head>
<title>The page you were looking for doesn't exist (404)</title> <title>The page you were looking for doesn't exist (404)</title>
<style type="text/css"> <style type="text/css">
@font-face{font-family:Roboto;src:url(https://s3.amazonaws.com/joindiaspora/fonts/Roboto-Regular.ttf)} @font-face{font-family:Roboto;src:url("Roboto-Regular.ttf")}
@font-face{font-family:Roboto-BoldCondensed;src:url(https://s3.amazonaws.com/joindiaspora/fonts/Roboto-BoldCondensed.ttf)} @font-face{font-family:Roboto-BoldCondensed;src:url("Roboto-BoldCondensed.ttf")}
body, body,
html { html {
@ -19,7 +19,7 @@
color: #666; color: #666;
text-align: center; text-align: center;
font-family: Roboto, Helvetica, Arial, sans-serif; font-family: Roboto, Helvetica, Arial, sans-serif;
background-image: url(https://joindiaspora.s3.amazonaws.com/assets/pattern-4deadcd0b3ee298c791c9055bdef3377.png); background-image: url("bgpattern.png");
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
@ -79,7 +79,7 @@
</div> </div>
<div id="cat-footer" class="transparent"> <div id="cat-footer" class="transparent">
<img src="https://s3.amazonaws.com/joindiaspora/peeping-tom.png"> <img src="peeping-tom.png">
</div> </div>
</body> </body>
</html> </html>

BIN
public/Roboto-BoldCondensed.ttf Normal file
View file

Binary file not shown.

BIN
public/Roboto-Regular.ttf Normal file
View file

Binary file not shown.

BIN
public/bgpattern.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB

BIN
public/peeping-tom.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 62 KiB