Jonne Haß
1a58f9cf29
Merge branch 'mobile_comment' of https://github.com/movilla/diaspora into develop
...
Conflicts:
Changelog.md
2013-03-18 20:59:39 +01:00
movilla
bf2bd5a97c
Hide comment button in the mobile view when not signed in
2013-03-18 20:15:55 +01:00
movilla
3990bebcf4
Fix mobile view of deleted reshares
2013-03-18 16:52:37 +01:00
Jonne Haß
e51443b3ef
Merge pull request #4059 from marpo60/remove_unnecessary_javascript_views
...
delete unused javascript views
2013-03-15 11:45:22 -07:00
Juan Manuel Azambuja
06dc53749a
delete unused javascript views
2013-03-15 14:39:34 -03: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
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
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
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
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
embs
e7daa978e3
Show timestamp when hovering on comment time-ago string. Closes #4042
2013-03-08 00:33:19 -03: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
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ß
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ß
ccedb6eff0
delegate parent_author to the target of a RelayableRetraction
2013-02-28 17:01:58 +01:00
Jonne Haß
df1abefc1c
Merge pull request #4015 from movilla/upload_photo_1
...
Fix css and js error with upload photo mobile
2013-02-27 17:11:04 -08:00
movilla
9b2d3c66bf
fix css and js error with upload photo mobile
2013-02-28 01:09:40 +01:00
Jonne Haß
b1cdc30367
Merge pull request #4004 from movilla/upload_photo
...
Upload photo mobile. Close #3324
2013-02-26 15:30:09 -08:00
movilla
76b1e9b0dc
Add the ability to upload photos from the mobile site
2013-02-26 23:25:58 +01:00
Jonne Haß
cf9659de4a
fix XSS vulnerability in conversations#new, closes #4010
2013-02-26 19:09:30 +01:00
pestrada
3f3409a0a5
avoid posting empty comments
...
fix Jasmine test
updated changelog with bugfix #3836
fix changelog update
remove wrong bug fix line
2013-02-25 18:27:46 -06:00
Jonne Haß
0cf1c2d020
Sort tag followings alphabetically, not in reverse, fixes #3986
2013-02-24 16:22:01 +01:00
Fabián Rodríguez
c1eb986f5b
remove unnecessary code from people_controller#contacts and use #each in view
2013-02-23 22:36:04 -02:00
Fabián Rodríguez
e76935daaf
remove inline styles from views/people/show
2013-02-23 22:36:04 -02:00
Fabián Rodríguez
7472642bd1
Refactor:
...
*people_controller#show
*photos_controller#index
*views/people/show both html and mobile
2013-02-23 22:36:03 -02:00
Jonne Haß
19b9b0edb8
Merge pull request #3990 from movilla/mismatch_author_name
...
Wrap text if too long in mobile notifications
2013-02-22 07:51:20 -08:00
movilla
c52a878e86
Wrap text if too long in mobile notifications
2013-02-22 16:15:25 +01:00
Florian Staudacher
f788f3426a
Merge pull request #3946 from MrZYX/feature/1781-include-reshares-in-user-feed
...
Include reshares in the public user feed, closes #1781
2013-02-21 13:37:29 -08:00
movilla
e0d0d0f668
Fixed removing images from publisher on the profile and tags pages
2013-02-21 22:19:24 +01:00
Jonne Haß
35350d1ceb
Include reshares in the public user feed, closes #1781
2013-02-21 14:32:28 +01:00
Jonne Haß
0fd3bcb397
move custom splash page login into the controller, fixes #3991
2013-02-21 13:46:04 +01:00
movilla
5769abcc32
Include our custom fileuploader on the mobile site too
2013-02-20 16:01:08 +01:00
Jonne Haß
1f4787aa6d
Merge pull request #3980 from L3MNcakes/feature/facebook_delete
...
Feature/facebook delete
2013-02-18 11:17:51 -08:00
L3MNcakes
1120cba5f0
Issue #3939 : Posts to Facebook do not delete
2013-02-18 18:21:59 +00:00
Jonne Haß
35ba082ab5
Merge branch 'overflow_mobile_post' of git://github.com/movilla/diaspora into develop
...
Conflicts:
Changelog.md
2013-02-17 15:48:34 +01:00
Jonne Haß
40b10dc0d9
Merge branch 'overflow_author_infor' of git://github.com/movilla/diaspora into develop
...
Conflicts:
Changelog.md
2013-02-17 15:47:20 +01:00
