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
|
103e62a4ff
|
Fix merge conflict with changelog
|
2012-11-07 21:10:39 -06: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 |
|
Sean Tilley
|
93250892a8
|
Merge pull request #3715 from brauliomartinezlm/3663_refactor_remove_posts_new_action
Issue #3663: [Refactor] Remove posts#new action
|
2012-11-07 18:38:05 -08:00 |
|
Braulio Martinez
|
ab3a7d991c
|
Remove ugly whitespaces
|
2012-11-07 23:16:25 -02: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 |
|
Fabián Rodríguez
|
f22ec35989
|
remove app/views/shared/author_info
|
2012-11-06 21:39:35 -02:00 |
|
Jonne Haß
|
051adfde45
|
Merge pull request #3709 from denschub/feature/3472-session-remember
Make Devise remember the session for 2 weeks
|
2012-11-06 13:59:01 -08:00 |
|
Dennis Schubert
|
ba5b779cd0
|
Make Devise remember the session for 2 weeks. Fix #3472
|
2012-11-06 22:24:57 +01:00 |
|
movilla
|
5a2b22ff0c
|
reshares_count come back!
|
2012-11-06 21:05:48 +01:00 |
|
Besnik
|
1d3493909d
|
updating sq locale
|
2012-11-06 19:46:51 +01: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 |
|
Jonne Haß
|
cc7f5d9626
|
Merge pull request #3708 from movilla/invitacion_search
Fix Invite link box shows on search results page even if invites have been turden off - Fix #3707
|
2012-11-06 08:58:24 -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 |
|
Florian Staudacher
|
18e755c8a9
|
installer output system rework
|
2012-11-04 22:41:01 +01:00 |
|
Eitan Adler
|
2e95183bba
|
Fix buggy assumption that bash exists in /bin.
While here avoid bashisms in the first place.
|
2012-11-04 22:41:01 +01:00 |
|
Eitan Adler
|
9b75f1a83e
|
Remove non-portable bashisms from most of the scripts.
Only install.sh has any bashisms left. However, the bug
which prevented it from running on most systems (using
/bin/bash directly) has been fixed.
|
2012-11-04 22:41:01 +01:00 |
|
Jonne Haß
|
e75aa111e3
|
use foremans formation option and not the alias concurrency, start unicorn_rails instead of unicorn
|
2012-11-04 17:05:16 +01:00 |
|
Jonne Haß
|
f506c9c71e
|
Merge pull request #3702 from jaywink/feature/twitter-posting-fixes
Only include url to post for twitter when post exceeds maximum length or contains photos
|
2012-11-03 14:45:03 -07:00 |
|
Jason Robinson
|
7fafabdb60
|
Only include url to post for twitter when post exceeds maximum length or contains photos
|
2012-11-03 23:25:19 +02:00 |
|
Jonne Haß
|
675bf614ae
|
Merge pull request #3670 from MrZYX/feature/fix_services
update and fix services
|
2012-11-02 03:53:35 -07:00 |
|
Jonne Haß
|
2a45470232
|
Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services
Conflicts:
Changelog.md
app/models/services/facebook.rb
spec/models/services/facebook_spec.rb
|
2012-11-02 11:31:47 +01:00 |
|
Jason Robinson
|
e974d2934f
|
Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items
|
2012-11-02 00:23:33 +02:00 |
|
Jonne Haß
|
3aef807f78
|
Merge pull request #3693 from jaywink/feature/3283-empty-page-after-service-callback
Fix empty page after callback from service by redirecting to origin
|
2012-11-01 13:33:27 -07: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 |
|
Jonne Haß
|
441c937ba6
|
Merge pull request #3697 from movilla/overflow_input
Fix overflow button in mobile reset password
|
2012-10-31 15:39:36 -07:00 |
|
movilla
|
86ca3a36fb
|
Add Changelog
|
2012-10-31 23:36:25 +01:00 |
|
movilla
|
e943a1cab6
|
Fix overflow button in mobile reset password
|
2012-10-31 23:31:24 +01:00 |
|
movilla
|
880b16f530
|
Add My Activity icon mobile
|
2012-10-29 12:14:19 +01:00 |
|
Jonne Haß
|
f91ca7d650
|
added short description to the server section [ci skip]
|
2012-10-27 11:45:26 +02:00 |
|
movilla
|
c9b58c9ff6
|
Add My Activity icon mobile
|
2012-10-26 22:47:43 +02:00 |
|