nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12756 commits 4 branches 0 tags 121 MiB
Commit graph

52 commits

Author SHA1 Message Date
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
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
movilla
c9b58c9ff6 Add My Activity icon mobile 2012-10-26 22:47:43 +02:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Jonne Haß
1a93ccd548 don't error out if the root of a reshare of a reshare got deleted, fixes #3546 2012-10-24 19:51:31 +02:00
Dennis Schubert
5ea998a382 Change 'unless' to 'if' again because 'unless' is wrong here. 
Also, add some specs and add it to the changelog.
 2012-10-24 00:27:45 +02:00
Florian Staudacher
0057e9ed46 some small code style changes + final fix for postgres (milliseconds) 
+ updated changelog
 2012-10-21 16:10:27 +02:00
Jonne Haß
f0ef4a764e refactor script/server and associated stuff 2012-10-19 12:25:15 +02:00
movilla
f6f5a62f69 Fix show post Community Spotlight on stream 2012-10-14 00:01:46 +02:00
Florian Staudacher
5994180900 Merge branch 'popup_notifications' of git://github.com/movilla/diaspora into notification-popup 
merge pull request #3656

Conflicts:
	Changelog.md (resolved)
 2012-10-13 16:18:09 +02:00
movilla
ebd1b28b2d Fix problem javascript with read-unread notifications on notifications popup 2012-10-13 15:16:06 +02:00
Jonne Haß
e3594d58d4 make Changelog an unorderdd list for now, we need to work out a consistent style for that [ci skip] 2012-10-13 13:56:23 +02:00
Fabián Rodríguez
0b21153dbd update changelog 2012-10-11 19:49:00 -02:00
movilla
928a8a02d8 Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false 2012-10-10 16:49:45 +02:00
Jonne Haß
e6ec41930b Merge branch 'hotfix/0.0.1.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2012-10-09 22:37:53 +02:00
Jonne Haß
3eb628c2a3 fix french javascript pluralization rule and add specs for locale loading 2012-10-09 22:36:30 +02:00
Jonne Haß
8493dfe86d post release version bump [ci skip] 2012-10-08 13:22:43 +02:00
Jonne Haß
b56ef50872 pre release changes for 0.0.1.0 2012-10-07 15:04:45 +02:00
Florian Staudacher
4b20e762e7 more changelog entries 2012-10-07 14:56:46 +02:00