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 |
|
Florian Staudacher
|
2c7f2d6fbb
|
Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment
[ci skip]
Conflicts:
Changelog.md
|
2012-12-07 17:47:19 +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 |
|
Flaburgan
|
aee6068412
|
Resize deletelabel and ignoreuser images to align them
|
2012-12-02 13:20:24 +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ß
|
bf698f3882
|
Do not strip "markdown" in links when posting to services, fix #3765
|
2012-11-26 14:16:43 +01:00 |
|
David McMullin
|
0873ae9ab7
|
improve behaviour of deselect all
|
2012-11-25 17:38:19 +00:00 |
|
David McMullin
|
f6b32fd13a
|
rename the JS so the magic can return
|
2012-11-25 17:38:19 +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ß
|
c59bb35087
|
Merge pull request #3754 from marpo60/housekeeping
Housekeeping2
|
2012-11-22 01:06:30 -08:00 |
|
Jonne Haß
|
5f6e03cfe5
|
Merge pull request #3714 from marpo60/refactor
Housekeeping
|
2012-11-22 01:06:05 -08:00 |
|
Fabián Rodríguez
|
99abc22403
|
remove unused methods
|
2012-11-21 18:26:17 -02:00 |
|
Fabián Rodríguez
|
232539cdf9
|
remove unused helpers
|
2012-11-21 18:26:17 -02:00 |
|
Sean Tilley
|
a5050273ca
|
Merge pull request #3727 from jaywink/feature/2321-fix-message-notifications
Fix notifications for private messages between local users, fixes #2321
|
2012-11-19 13:48:17 -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 |
|
Jason Robinson
|
6cf6f1dd7d
|
Fix notifications for private messages between local users, fixes #2321
|
2012-11-11 23:35:19 +02:00 |
|
movilla
|
764aa579cd
|
fix css error with intivation people block in search results
|
2012-11-11 15:38:03 +01:00 |
|
movilla
|
554fe40235
|
Web mobile notificacions count dont change to unread-read when click in link post
|
2012-11-11 14:45:07 +01:00 |
|
Jason Robinson
|
48a332f871
|
Remove by default markdown formatting from posts done via service, currently only used by Twitter. Remove markdown also from Facebook posts.
|
2012-11-09 00:04:49 +02:00 |
|
Sean Tilley
|
7dfa6299ec
|
Merge branch 'reshares_count_stream' of https://github.com/movilla/diaspora into movilla-reshares_count_stream
Conflicts:
Changelog.md
|
2012-11-07 21:04:52 -06:00 |
|
Braulio Martinez
|
36c7c00550
|
Remove unused posts#new action from Backbone
|
2012-11-07 23:15:38 -02: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
|
4056c0da9e
|
remove unused method #can_add?
|
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
|
76c48f3c9c
|
privatize non-action controller method
|
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
|
3d061d92c6
|
remove unused templates
|
2012-11-06 21:39:35 -02:00 |
|
Fabián Rodríguez
|
48bb6ad25c
|
remove old experimental leftovers
|
2012-11-06 21:39:35 -02:00 |
|
Fabián Rodríguez
|
1d1b66f8cc
|
remove unused helper
|
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 |
|