nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13161 commits 4 branches 0 tags 121 MiB
Commit graph

13161 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
d9b36cd312 update changelog [ci skip] 2013-03-15 17:47:09 +01:00
Jonne Haß
8f6ae75423 Merge pull request #4039 from marpo60/diaspora_with_sprites 
Add Sprites to Diaspora!
 2013-03-15 09:44:27 -07:00
Jonne Haß
5a26d0b639 added sprites to .gitignore 2013-03-15 16:10:34 +01:00
Antoine D
fa1d0ce68e Update en.yml 
Only one sentence was not in future.
 2013-03-14 20:42:04 +01:00
Florian Staudacher
ecd93bca6f Merge pull request #4056 from marpo60/fix-4023 
fix reshares in single post-view
 2013-03-13 01:28:07 -07:00
Fabián Rodríguez
d63aff8ea8 update changelog 2013-03-12 20:24:03 -03:00
Juan Manuel Azambuja
78e1f6f251 add assets:preocompile prerequisite for cucumber specs on CI 2013-03-12 12:23:55 -03:00
Fabián Rodríguez
0a3e242e79 fix reshares in single post-view 2013-03-11 22:45:25 -03:00
Juan Manuel Azambuja
2556f08b89 [Sprites] update sprites after develop merge 2013-03-11 20:16:16 -03:00
Juan Manuel Azambuja
1115e10536 Merge branch 'develop' into diaspora_with_sprites 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
 2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja
8686cb4fcb [Sprites] social media logos sprite usage 2013-03-11 19:27:35 -03:00
Juan Manuel Azambuja
8747e6601d [Sprites] add sprites for branding 2013-03-11 19:26:57 -03:00
Juan Manuel Azambuja
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
Jonne Haß
33acc1f7a2 Merge branch 'hotfix/0.0.3.3' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-03-11 21:24:56 +01:00
Jonne Haß
2ca35fbb24 Merge branch 'hotfix/0.0.3.3' 2013-03-11 21:23:43 +01:00
Jonne Haß
c7283c60a1 release 0.0.3.3 2013-03-11 21:23:28 +01:00
Alexander Wenzowski
57669017bd bundler should communicate with rubygems using ssl 2013-03-11 21:21:31 +01:00
Florian Staudacher
0de68fb713 Merge pull request #4029 from MrZYX/4027-unicode-tags 
decode tag name before passing it into TagFollowingAction
 2013-03-11 05:51:54 -07:00
Jonne Haß
1761fc35a7 Merge pull request #4031 from movilla/test_mobile 
Add some tests for mobile page
 2013-03-10 09:14:06 -07:00
movilla
7a8269ebf3 * Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile 
* Complete the existing: Post mobile.
* Complete some test for no mobile: Edit profile, Post main.
* Fix little error css and js mobile.
* Add file-upload-custom javascripts to mobile.js.
 2013-03-10 15:02:18 +01:00
Jonne Haß
97a8ff65ba Merge pull request #4048 from marpo60/s3_max_age 
Set max-age header to Amazon S3 resources
 2013-03-10 06:14:49 -07:00
Jonne Haß
931577c801 Merge pull request #4052 from jaywink/3706-facebook-missing-link 
If post has photos, always include url in post to Facebook
 2013-03-10 06:13:47 -07:00
Jason Robinson
affa713616 If post has photos, always include url in post to Facebook to stay consistant with other servies, fixes #3706 2013-03-10 08:15:12 +02:00
Jonne Haß
3c29007c39 Merge pull request #4051 from Flaburgan/clean-delete-validation 
Remove duplicate sentence from delete account confirmation pop up
 2013-03-09 05:50:19 -08:00
Flaburgan
98da6a3978 Remove duplicate sentence from delete account confirmation pop up 2013-03-09 14:15:11 +01:00
Marcelo Dominguez
b950c4f171 Set max-age header to Amazon S3 resources 2013-03-08 16:07:56 -02:00
Florian Staudacher
8829d2a81e zsh doesn't find custom source files otherwise ... [ci skip] 2013-03-08 15:50:42 +01:00
Jonne Haß
60bd29aa68 decode tag name before passing it into TagFollowingAction, fixes #4027 2013-03-08 13:47:55 +01:00
Florian Staudacher
f8513c2005 Merge pull request #3944 from MrZYX/modular_layouts 
Modular layouts
 2013-03-08 02:50:43 -08:00
Jonne Haß
f61ef4069d Merge pull request #4046 from embs/feature/4042-show-timestamp-on-comment-hover 
Show timestamp when hovering on comment time-ago string. Closes #4042
 2013-03-08 02:03:34 -08:00
embs
e7daa978e3 Show timestamp when hovering on comment time-ago string. Closes #4042 2013-03-08 00:33:19 -03:00
Jonne Haß
20484fd3dd Merge pull request #4036 from pestrada/4030-resize-textarea-after-commenting 
reset comment box height after posting a comment
 2013-03-07 12:12:59 -08:00
pestrada
18aeeb052b reset comment box height after posting a comment 
refactor create comment method
 2013-03-07 12:55:03 -06:00
Jonne Haß
55cb070ac9 add header to sign up page 2013-03-06 19:01:07 +01:00
Jonne Haß
ffc6c1102e dry up and modularize layouts 2013-03-06 19:00:34 +01:00
Jonne Haß
43f21d6e55 Pass the real values to stderr_path and stdout_path in unicorn.rb since it runs a case statement on them 2013-03-05 23:37:51 +01:00
Jonne Haß
d02e9b72c2 Merge pull request #4037 from marpo60/avoid_redirect 
Avoid redirect
 2013-03-04 00:41:12 -08:00
Marcelo Dominguez
88e76448b6 Avoid unnecessarily redirect 2013-03-03 23:10:53 -02:00
Marcelo Dominguez
e2ad0cbb81 Remove whitespaces 2013-03-03 23:10:31 -02:00
Jonne Haß
bc0a9c8f89 Merge pull request #4034 from Gallaecio/gl 
Updated the Galician (gl) translation.
 2013-03-03 12:34:34 -08:00
Adrián Chaves Fernández (Gallaecio)
3d84467532 Updated the Galician (gl) translation. 2013-03-03 21:15:07 +01:00
Jonne Haß
ad16451e1f Merge pull request #4006 from afrerich/feature/3899-long-tags-break-the-layout 
fade long tag names - refs diaspora/diaspora#3899
 2013-03-02 12:20:15 -08:00
aaronf
cd78aa5a65 fade long tag names - refs diaspora/diaspora#3899 2013-03-02 13:57:30 -06:00
Jonne Haß
2ac16f41fb Merge pull request #4024 from instrumentio/feature/corrupt-fsck-roxml 
roxml should be loaded from rubygems
 2013-03-01 15:46:42 -08:00
Alexander Wenzowski
98207ed9ea roxml should be loaded from rubygems 2013-03-01 17:36:38 -05:00
Jonne Haß
7a89d8b161 only try to delete a post from a service if we're able to 2013-03-01 18:54:01 +01:00
Jonne Haß
1256fda24b make randomly on postgres failing spec pending for now 2013-03-01 03:54:44 +01:00
Jonne Haß
7b56c2dd52 Do not fail on receiving a SignedRetraction via the public route 2013-03-01 03:38:36 +01:00
Jonne Haß
fa8f4bd0b1 Merge pull request #4018 from instrumentio/feature/bundler 
bundler should communicate with rubygems using ssl
 2013-02-28 16:31:40 -08:00
Alexander Wenzowski
63f9a6f1ba bundler should communicate with rubygems using ssl 2013-02-28 19:05:39 -05:00