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
movilla
ceace52762
Add progress percentage to upload images
2012-12-20 21:24:09 +01:00
movilla
763a893829
Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser
2012-12-08 14:59:01 +01:00
Jonne Haß
0677459ff9
Merge branch 'css_mobi_notif' of git://github.com/movilla/diaspora into develop
2012-12-08 13:47:13 +01:00
Jonne Haß
459df9b735
Merge pull request #3791 from movilla/suggest_member
...
Translation "suggest member" of Community Spotlight
2012-12-06 09:34:01 -08:00
movilla
491c2a537c
Add feature contact pod admin
2012-12-06 15:26:49 +01:00
movilla
65376a604b
Allow translation of "suggest member" of Community Spotlight
2012-12-06 13:15:34 +01:00
Liam
c9559b93f5
Update cat image so it's secure - new image from khanb1 on flickr.
2012-12-02 10:31:45 +00:00
David McMullin
6e912adb88
add a necessary param, fix the retrieve limit
2012-12-01 11:18:13 +00:00
Jonne Haß
7b548fd571
Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags
...
port tagFollowings to BackBone
2012-11-25 09:30:47 -08:00
rschaden
49d4079065
add email validation to invitations
2012-11-25 14:25:20 +01:00
Bobby Wilson
abd4e17daf
Fix #3750
2012-11-22 13:00:47 -07:00
Jonne Haß
5f6e03cfe5
Merge pull request #3714 from marpo60/refactor
...
Housekeeping
2012-11-22 01:06:05 -08:00
Jonne Haß
e9bccb8afe
get rid of string concat of translatable strings in getting started
2012-11-18 17:24:43 +01:00
Fabián Rodríguez
f590abb343
fix 3682, use correct image path for padlocks
2012-11-15 18:17:15 -02:00
Dennis Schubert
ae53254259
Really remove Devises timeoutable...
...
... and force it to really remember the session by a hidden field.
2012-11-14 20:32:15 +01:00
movilla
3fa0254876
add simple background for unread messages/conversations mobile
2012-11-13 19:58:25 +01:00
David McMullin
97664cb880
port tagFollowings to BackBone
2012-11-12 21:37:00 +00:00
movilla
764aa579cd
fix css error with intivation people block in search results
2012-11-11 15:38:03 +01:00
Braulio Martinez
3260bada38
Remove posts#new action from Rails and related tests
2012-11-07 23:14:35 -02:00
Fabián Rodríguez
75c943e876
remove app/views/aspects/update
2012-11-06 21:39:37 -02:00
Fabián Rodríguez
893c37004e
remove app/views/aspects/index
2012-11-06 21:39:37 -02:00
Fabián Rodríguez
ae2b459f0e
remove app/views/aspects/aspect_list_item
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
3743eac10d
remove app/views/aspects/aspect_contacts
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
1961ab3326
remove app/views/invitations/edit
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
cf48d384a8
remove app/views/invitations/token_not_found
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
f26d8fdf4c
remove app/views/people/profile_photo_upload
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
8bc64bdf4f
remove app/views/people/aspect_list
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
8cf8fae396
remove app/views/people/add_contact_small
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
b7a6f8b3b2
remove app/views/likes/likes_container
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
34c601bc41
remove app/views/notifications/popup
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
48bb6ad25c
remove old experimental leftovers
2012-11-06 21:39:35 -02:00
Fabián Rodríguez
aa8b37f2be
remove app/views/requests/
2012-11-06 21:39:35 -02:00
Fabián Rodríguez
5d169a3d73
remove app/views/shared/mail_signup_form
2012-11-06 21:39:35 -02:00
Fabián Rodríguez
f22ec35989
remove app/views/shared/author_info
2012-11-06 21:39:35 -02:00
Jonne Haß
a78cacb799
Merge pull request #3687 from movilla/add_icon_mobile_my_activity
...
Add My Activity icon mobile. Close #3680
2012-11-06 09:02:46 -08:00
movilla
f3ce1e6c66
Fix Invite link box shows on search results page even if invites have been turned off
2012-11-06 15:56:53 +01:00
Jason Robinson
b96fbb0676
Fix empty page after callback from service by redirecting to origin. Also make settings/services page use the same window when authenticating with other services instead of launching a popup.
2012-11-01 21:50:31 +02:00
movilla
880b16f530
Add My Activity icon mobile
2012-10-29 12:14:19 +01:00
movilla
c9b58c9ff6
Add My Activity icon mobile
2012-10-26 22:47:43 +02:00
movilla
ebd1b28b2d
Fix problem javascript with read-unread notifications on notifications popup
2012-10-13 15:16:06 +02:00
Fabián Rodríguez
40f5314184
adds password_confirmation field to registration page
2012-10-11 19:45:52 -02:00
Sean Tilley
bbaf41aa8d
Merge pull request #3637 from movilla/dropdown_welcome_page
...
Aspect dropdown on welcome page (after signup) - overflow hidden - Fix #3604 [ci skip]
2012-10-08 14:36:01 -07:00
movilla
7be7ac3176
Aspect dropdown on welcome page (after signup) - overflow hidden - fix 3604
2012-10-08 19:15:21 +02:00
Florian Staudacher
83ab60ab9e
Merge branch 'hotfix/mobile-bookmarklet' into develop
...
fix layout determination for mobile bookmarklet
2012-10-05 12:25:33 +02:00
Jason Robinson
a26dc34a7b
Fix broken mobile bookmarklet, isse #3613
2012-10-05 09:53:19 +02:00
Florian Staudacher
8678c14735
Merge pull request #3589 from MrZYX/refactor_config
...
New configuration system, details: see changelog
2012-09-30 13:07:40 -07:00
David McMullin
586e23727c
add specs for chromeframe
...
fix typo in ChromeFrame itself
remove unneccessary chromeframe meta tags from layouts
2012-09-30 17:04:50 +01:00
Jonne Haß
89c1fd5f7f
query the set url only through #pod_uri in the app
2012-09-26 20:19:37 +02:00
Jonne Haß
2a4db54db9
New configuration system
...
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
2012-09-26 20:19:37 +02:00
Jonne Haß
e70e48d6ca
some refactoring regarding the law of demeter
2012-09-23 19:33:19 +02:00
