movilla
597ab20715
Show error and flash-notice when sending messages to non contacts
2012-12-26 12:23:37 +01:00
movilla
c1b858a877
Mark all unread post-related notifications as read, if one of this gets opened
2012-12-24 00:13:32 +01:00
movilla
ceace52762
Add progress percentage to upload images
2012-12-20 21:24:09 +01:00
Florian Staudacher
ff173e233c
add cucumber feature for taking screenshots of important pages
...
- for before/after comparisons,
including rake tasks for easily generating the images from command line
2012-12-17 20:25:34 +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
Florian Staudacher
94760f4c04
update jasmine gem, removed useless spec, + changelog)
2012-12-07 21:21:27 +01:00
Tom Scott
e717eaac70
Remove debugger from the Gemfile.
...
Developers are free to choose their own debugging agent, but unless
it causes problems, personal development gems are not to be
included in the project's Gemfile. This is so each developer can
maintain their own comfortable environment without having workflows
enforced upon them.
Conflicts:
Gemfile.lock
2012-12-07 14:21:09 -05: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
65c16ac44c
Update changelog
2012-12-02 13:26:46 +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
86ee4e2020
update changelog
2012-12-01 16:07:41 +00:00
Jonne Haß
bf27cca03a
Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead.
2012-11-30 18:16:56 +01:00
Jonne Haß
2a7a0b7b99
* made number of unicorn worker processes configurable
...
* made configuration loader indepenent of rails
* corrected mismatch between example and default config (server.db/server.database)
2012-11-30 14:00:25 +01:00
Jonne Haß
669dd87b11
extract configruation system to a gem
2012-11-30 13:35:59 +01: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
c3c603f8cd
Update changelog
2012-11-25 17:41:58 +00:00
Jonne Haß
96924b8458
updated changelog [ci skip]
2012-11-25 18:31:40 +01:00
Jonne Haß
e536622c4b
update changelog [ci skip]
2012-11-25 18:25:51 +01:00
Jonne Haß
cb785195c9
update changelog for #3759
2012-11-22 21:19:16 +01:00
Jonne Haß
6ccdb40f6f
update changelog [ci skip]
2012-11-22 10:37:30 +01:00
Jonne Haß
f1aeecc00b
force typhoeus (and thus curl) to use diaspora.yml's CA bundle
2012-11-21 17:28:39 +01:00
Florian Staudacher
442008657e
changelog update before release
2012-11-20 19:12:42 +01: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
Fabián Rodríguez
f3134206e1
update changelog
2012-11-15 18:18:47 -02:00
movilla
3fa0254876
add simple background for unread messages/conversations mobile
2012-11-13 19:58:25 +01:00
Jason Robinson
c437636131
Fix message_spec test and add tests for private message notification unread count. Update changelog
2012-11-12 22:00:13 +02:00
Jonne Haß
63f2d335a4
Merge branch 'notifications_count' of git://github.com/movilla/diaspora into develop
2012-11-11 15:00:46 +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
Jonne Haß
6056572b99
update changelog for gem updates [ci skip]
2012-11-11 14:32:39 +01:00
Jonne Haß
8b89a5ca00
Merge pull request #3679 from Raven24/grimreaper-develop
...
Remove non-portable bashisms from most of the scripts. ++
2012-11-10 09:06:23 -08:00
Florian Staudacher
aaea4a3676
changelog update
2012-11-10 17:57:56 +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
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
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
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
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ß
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
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
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
