Commit graph

1641 commits

Author SHA1 Message Date
Jonne Haß
f23fb6b6cb Actually allow false as a value for sidekiq.backtrace in our Sidekiq
middleware
2014-06-13 16:04:40 +02:00
Jonne Haß
fc1f249129 Harden account deletion
* Wrap it into a transaction
* Use destroy over delete so dependent destroys get triggered
  and we thus don't fail on the foreign key constraits
* Check if a photos status message actually exists before accessing
  it
* Add missing dependent destroys
2014-05-27 00:15:15 +02:00
Jonne Haß
77133a4062 Merge pull request #4963 from Ruxton/feature/rake_task_to_run_account_deletion_fixes_4792
Rake task for running outstanding account deletions
2014-05-24 18:03:10 +02:00
Jonne Haß
cbd9c56a7a Merge pull request #4919 from hpetru/4776-mention-on-mobile
Unescape text before add mention, this commit solve #4776

Conflicts:
	Changelog.md
2014-05-24 17:34:29 +02:00
Jonne Haß
d36589e05b Remove hack from exporter
I couldn't reproduce what the comment states anymore, so I just removed
it. This fixes a minor issue where html wouldn't be escaped in the
export.

Thanks to A Kai (@sixhundredns) for reporting.
2014-05-24 15:27:13 +02:00
Ruxton
ba223fd3d7 Rake task for running outstanding account deletions 2014-05-19 16:05:16 +08:00
Lukas Matt
e4adb7e11b Ignore user report associations 2014-05-15 07:23:44 -04:00
Hincu Petru
e699a682f4 Unescape text before add mention, this commit solve #4776 2014-05-06 12:13:43 +00:00
Gabriel Lima
00b6a39ad5 fix bug #4832 select language for email content when invite a friend 2014-04-14 18:56:29 -03:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer
Introduce message renderer
2014-04-13 15:00:46 +03:00
Jason Robinson
6947a1945c Merge pull request #4883 from MrZYX/uuid
Use uuids for guid generation
2014-04-11 16:40:57 +03:00
Jannik Streek
095d616198 fixed federation issue due to missing delegation + test + some minor tweaks
fixed indenting

renamed test
2014-04-06 20:58:58 +02:00
Steffen van Bergerem
35b1ba088e Fix ui glitch in Bootstrap publisher 2014-03-31 22:38:45 +02:00
Jannik Streek
d0a77ce6b3 design for poll participation implemented, saving works as well 2014-03-31 18:14:07 +02:00
Jannik Streek
8a4f833d1d added more tests for the poll federation + fixed broken rspec tests 2014-03-31 18:14:06 +02:00
Jannik Streek
fe67bdf2e7 added tests for poll federation and impl for the federation itself. Still in progess 2014-03-31 18:14:06 +02:00
Hincu Petru
2be528494a Fix jquery.mentionInput.js plugin 2014-03-31 08:51:40 +00:00
Jonne Haß
98057885ac use uuids for guid generation 2014-03-30 15:38:18 +02:00
Jonne Haß
8280556a47 Introduce message renderer
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
2014-03-15 17:16:17 +01:00
Jonne Haß
bd24cb71a4 Fix plaintext mode for mentionable
Also slight refactors to it.
2014-03-09 14:02:15 +01:00
Darshan Rai
1f782dace9 Moved mentionsInput.js from vendor/assets to lib/assets
The jquery.mentionsInput plugin upstream is no longer maintained.
2014-02-10 23:19:50 +05:30
Ruxton
c8a0c81b6a Updating queries for the stream to be faster 2014-02-07 14:23:19 +08:00
Raphael Sofaer
de593f6e9f Do not retry sending out posts on SSL errors. See #4728
Refactor HydraWrapper so the when-to-retry logic is in the worker
2014-01-27 15:45:45 -08:00
Steffen van Bergerem
3d4bdfb665 Drop number of followers from tags page 2014-01-21 14:49:05 +01:00
Dennis Schubert
6fc5ccb9f9 Merge pull request #4511 from MrZYX/bump_devise
update devise to 3.2
2014-01-15 13:17:48 -08:00
Jonne Haß
15b1dae362 update devise to 3.2 2014-01-15 12:59:59 +01:00
Ivan Zotov
a4ce6e267a Fix after_create to after_commit 2014-01-14 22:35:29 +04:00
Fabian Rodriguez
78c923de89 Merge pull request #4197 from MrZYX/bump_sidekiq
Update Sidekiq
2013-12-21 05:20:54 -08:00
Jonne Haß
c660c90091 Merge pull request #4612 from diaspora/drop_spv_old_code
Drop spv old code
2013-12-11 07:41:51 -08:00
Jonne Haß
a9e52528c1 bump sidekiq 2013-12-08 14:03:08 +01:00
Fabian Rodriguez
2b8c8a58ee fix i18n fallback after i18n update 2013-12-05 11:35:13 -02:00
Fabian Rodriguez
6c8c4fc99e remove template picker functionality 2013-12-03 20:53:00 -02:00
Florian Staudacher
260d86d501 refactor ConversationsController, move query builing to User model 2013-09-30 01:44:57 +02:00
Colin Dean
a4ce4404ff change bitcoin_wallet_id to bitcoin_address
It is better to call it an address than a wallet ID, because the latter may
confuse Bitcoin users who conflate the two. They are not the same.

Also adds convenience method to handle the deprecated variable.
2013-08-31 20:16:23 -04:00
Jonne Haß
0cdfc7cfbd Make I18n systems more robust against missing keys in pluralization data
Should make situations like #4468 less frequent
2013-08-30 19:31:48 +02:00
Florian Staudacher
ba9e715c66 Merge branch '4239-move-federation-stuff-into-lib' of github.com:oliverbarnes/diaspora into oliverbarnes-4239-move-federation-stuff-into-lib 2013-08-27 22:05:27 +02:00
Jonne Haß
96149cfe23 Precompile the assets for jasmine too 2013-08-22 09:56:35 +02:00
Roger Braun
ec9c8d7dae Remove photo backdrop in single post view. 2013-08-16 10:46:15 +02:00
Oliver Azevedo Barnes
c5a1078f45 Moved account_deleter as well, same tests break 2013-08-13 18:37:51 -05:00
Oliver Azevedo Barnes
7214dc184d Remove namespacing from federation libs recently migrated from app/models/ 2013-08-13 18:23:05 -05:00
Oliver Azevedo Barnes
1c9d65e94c WIP refactor namespacing for federation libs, into Diaspora::Federated 2013-08-12 13:10:38 -05:00
Oliver Azevedo Barnes
5564644306 WIP 2013-08-12 13:10:38 -05:00
Oliver Azevedo Barnes
689abfb49c Move non-model federation stuff into lib/ 2013-08-12 13:10:38 -05:00
Andrew Smith
2bb6bc8eef Added Wordpress service functionality,
for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs.

Added model for Wordpress service

Added very very basic Wordpress cross-posting functionality.

Added markdown support to post body

Fixed Wordpress::MAX_CHARACTERS problem

cleanup

Added default settings for Wordpress OAuth

Added default settings for Wordpress OAuth

Added Wordpress to configured services spec.

changelog changes
2013-08-04 07:46:56 -07:00
carolina
f6fe74aeae Migration to turn ActivityStreams::Photo to StatusMessage
deletes ActivityStream model and all it's references

update migration with the without_protection option to disable mass assignment protection
2013-07-31 15:15:08 +02:00
fabianfiorotto
3e5b29b289 Fix pagination for people list on the tag stream page
Update _index.html.haml

This params broken the pagination of the followers list in tags page
To reproduce try to paginate in
https://joindiaspora.com/tags/diaspora

test for people pagination patch

reducing the per page limit

removing tabs
2013-07-06 13:10:29 +02:00
Florian Staudacher
fd2917271c it appears autoload in production doesn't pick up the new
"Diaspora::Mentionable" module
2013-06-10 13:57:49 +02:00
Florian Staudacher
4ee5d5f19c replace mentions of out-of-aspect people in limited posts with just a
markdown link to their profile (fixes #2516)

add failing spec for #4160 / #2516

extend the spec a bit more

refactor mention handling in a status message

add method for filtering mentions by aspects

wire mention filtering into the status message model, adapt a few tests to
work properly

cosmetic changes

shorten helper methods

add changelog entry
2013-06-09 19:16:40 +02:00
Florian Staudacher
bcb1214f99 Merge pull request #4162 from MrZYX/typhoeus
bump Typhoeus and refactor HydraWrapper
2013-06-04 03:36:39 -07:00
Jonne Haß
d331242d94 Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop
Conflicts:
	Changelog.md
2013-05-25 13:50:28 +02:00