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
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ß
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ß
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ß
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
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
Florian Staudacher
4cbae601e8
[WIP] aspect membership dropdown Backbone.js rework
...
* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships
TODO
* more tests
2013-02-17 13:40:10 +01:00
Lennart Prelle
2d0abe8309
added a id and a autoscroll to first unread message in conversation ( Fix : #3216 )
2013-02-11 16:15:01 +01:00
movilla
63f1d1c197
friendlier mobile buttons
2013-02-09 15:23:04 +01:00
Ruxton
ff7308685a
Add a changelog_url helper so that pods can report a more correct changelog
2013-02-04 09:45:36 +08:00
movilla
0ea7bc5258
Adapt css for search mobile page
2013-02-02 23:23:22 +01:00
movilla
507e8ee199
Add Getting_Started page mobile
2013-02-02 16:02:19 +01:00
Jonne Haß
b8128d356b
Merge branch 'hotfix/0.0.2.4' into develop
...
Conflicts:
Changelog.md
app/views/people/show.html.haml
config/defaults.yml
spec/helpers/layout_helper_spec.rb
2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28
Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948
...
From a quick look at the for us available databases this was not actually used in the wild.
2013-02-01 22:20:31 +01:00
Jonne Haß
1aa8b6e9f2
do not display the publisher on the profile photos page
2013-01-31 19:25:30 +01:00
Asphyxia
b91ed859a1
Hovering a Timeago-String should show the Timestamp
2013-01-31 13:43:37 -03:00
Asphyxia
389e93a3ae
Stream form on profile page
2013-01-31 00:15:27 -03:00
Jonne Haß
d398365641
Merge branch 'movilla-settings_mobile' into develop
2013-01-29 15:13:19 +01:00
Jonne Haß
4eb98cd7dc
Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile
...
Conflicts:
Changelog.md
2013-01-29 14:58:11 +01:00
Fabián Rodríguez
649844ea6a
Refactor contacts/index
2013-01-29 10:01:08 -02:00
movilla
0010819343
add settings web mobile
2013-01-27 20:38:19 +01:00
Asphyxia
6ee921235e
Side panel ui changes
2013-01-27 08:04:33 -03:00
Diaspora Europe
6d4e577676
show links in sidebar #1338
2013-01-26 11:59:15 +01:00
malavbhavsar
4629afb1f5
Fix services index view.
2013-01-24 23:00:53 -05:00
Asphyxia
7f34c7af7a
Issue #3874 : Distorted profile thumbnail
2013-01-21 22:43:48 -03:00
Asphyxia
d6a9818632
Issue #3851 : Profile pictures not centered
2013-01-18 15:51:59 -03:00
Asphyxia
5a6090a0fb
Issue #3846 : Wrong message on mobile
2013-01-18 15:40:00 -03:00
Fabián Rodríguez
0f499e7c2e
make publisher work with backbone
2013-01-16 19:33:20 -02:00
Fabián Rodríguez
2eba28266b
remove server side rendering of aspects
2013-01-16 19:33:19 -02:00
Diaspora Europe
ac3b2bc99f
pod version in footer and updated link to changelog #3705
2013-01-15 16:45:10 +01:00
Diaspora Europe
c8ddba6b3e
add images to notifications
2013-01-11 12:30:12 +01:00
