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

2124 commits

Author SHA1 Message Date
cmrd Senya
69b46df3d6 Notifications for comments on local posts by non-contacts 2015-10-14 22:32:19 +02:00
cmrd Senya
dc02c5384b Notify a remote user when a non-contact user likes or comment her public post 2015-10-14 22:30:35 +02:00
Florian Staudacher
f8e93e1554 forgot to pass my own exceptions through 2015-09-01 01:36:04 +02:00
Florian Staudacher
461c8e67cd make the error handling more robust 
catch more exceptions higher up in the hierarchy
 - don't stop checking all pods if there's just one malfolmed pod
avoid echoing the complete body on json error
 2015-08-31 19:39:00 +02:00
Florian Staudacher
ea397ffdfb Add connection test for pods in the network 
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
 2015-08-24 22:04:53 +02:00
Steffen van Bergerem
89a3ea6d20 Merge branch 'stable' into develop 2015-08-23 14:45:33 +02:00
Jonne Haß
a1ca45b201 Update NodeInfo to final 1.0 schema 
closes #6340
 2015-08-23 14:45:20 +02:00
Jonne Haß
d396d5555f Merge branch 'stable' into develop 2015-08-21 14:23:46 +02:00
Benjamin Neff
663835ed3a remove old webfinger/hcard code 
closes #6310
 2015-08-21 14:23:08 +02:00
Benjamin Neff
d28e03f053 use discovery from diaspora_federation gem 2015-08-21 14:21:43 +02:00
Dennis Schubert
be8f920c29 Merge branch 'stable' into develop 2015-07-24 04:05:32 +02:00
Jonne Haß
487b0d90ca Implement NodeInfo 2015-07-24 03:50:02 +02:00
Jonne Haß
0cbe7ec9a8 Merge branch 'stable' into develop 2015-07-22 10:05:46 +02:00
Steffen van Bergerem
f8bbe71f54 Remove correlations 
closes #6223
 2015-07-22 09:46:52 +02:00
Steffen van Bergerem
c8f482064c Remove rake_helpers 2015-07-22 09:41:53 +02:00
Benjamin Neff
804784ed3f fix @pod_uri/@pod_url and add url_to to AppConfig 2015-07-14 05:50:26 +02:00
Benjamin Neff
94fc378eb7 fix @pod_uri/@pod_url and add url_to to AppConfig 2015-07-11 11:19:42 +02:00
Jonne Haß
1e4224813e Merge branch 'stable' into develop 2015-07-05 20:50:42 +02:00
Benjamin Neff
2294e59ee3 change public_url to atom_url and profile_url 2015-07-05 20:44:24 +02:00
Jonne Haß
188e554b7b Merge branch 'stable' into develop 2015-06-21 20:48:57 +02:00
fap
1061e101fd Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config. 
This also enables the podmin account to send messages
to any local user.

closes #6128
 2015-06-21 20:48:48 +02:00
Steffen van Bergerem
92a3dd53f0 Replace jquery.autoresize with autosize 2015-06-14 20:03:15 +02:00
Jonne Haß
40913f000a make assets:generate_error_pages depend on environment [ci skip] 2015-06-08 10:37:37 +02:00
Dennis Schubert
8a4ec1d4c6 Merge branch 'stable' into develop 2015-06-08 04:18:38 +02:00
Benjamin Neff
d42b5c128e update photos when received over public path 
closes #6082
 2015-06-08 04:18:31 +02:00
Benjamin Neff
e16b9af7e6 make public and private receiver work similar ... 2015-06-08 04:15:17 +02:00
Benjamin Neff
c75f92d07a add XMLLogger to debug federation 2015-06-08 04:15:17 +02:00
Dennis Schubert
0c6ca1d235 Merge branch 'stable' into develop 2015-06-08 00:58:20 +02:00
Benjamin Neff
aa2297a8c0 retry receive share-visibility when failed while receiving parallel 
refactoring:
- remove unused return-values (were used for caching, which was removed again)
- remove transaction (doesn't help here, added in 2615126)

closes #6068
 2015-06-08 00:58:00 +02:00
Jonne Haß
ab1e879cc2 Merge branch 'stable' into develop 2015-06-07 11:36:12 +02:00
Benjamin Neff
2571b042c6 only log private stuff to debug 
closes #6069
 2015-06-07 11:36:07 +02:00
Jonne Haß
7bfa0f857c Merge branch 'stable' into develop 2015-06-06 15:23:44 +02:00
Jonne Haß
6c71d9f257 Only strip text direction markers around hashtags for now 
Fixes #6067
 2015-06-06 15:23:12 +02:00
Dennis Schubert
b41007fae7 Merge branch 'stable' into develop 2015-06-04 04:18:34 +02:00
Benjamin Neff
27b4a44e4a replace Rails.logger with logging-logger 
closes #6041
 2015-06-04 04:17:15 +02:00
Benjamin Neff
b6c46b3fc4 add logging mixin and replace federation-logger 2015-06-04 04:16:03 +02:00
Jonne Haß
3850118e4e Merge branch 'stable' into develop 2015-06-02 12:14:42 +02:00
Steffen van Bergerem
1b77258d0e Set default for post title truncation to 70 characters 
closes #6022
 2015-06-02 12:14:35 +02:00
Dennis Schubert
8c4bcd8bd3 Merge branch 'stable' into develop 2015-05-31 01:47:09 +02:00
Steffen van Bergerem
fdad348898 Fix tag rendering in emails 
closes #6009
 2015-05-31 01:47:05 +02:00
Dennis Schubert
44919233c0 Merge branch 'stable' into develop 2015-05-28 01:34:28 +02:00
Benjamin Neff
21ae93e658 handle when the diaspora xml parser returns nil 
closes #5991
 2015-05-28 01:34:24 +02:00
Dennis Schubert
f9f73f56db Merge branch 'stable' into develop 2015-05-25 04:18:46 +02:00
Jason Robinson
7c0e50c2c2 Introduce 'authorized' configuration option for services 
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.

Clarifies the situation for #5923, #5260 and #5085.

closes #5985
 2015-05-25 04:18:38 +02:00
Dennis Schubert
944c57f874 Merge branch 'stable' into develop 2015-05-18 03:23:43 +02:00
Benjamin Neff
196e438286 remove some hardcoded diasporahq hax 2015-05-18 03:23:14 +02:00
Jonne Haß
13b69f81d1 Merge branch 'stable' into develop 2015-05-16 13:54:05 +02:00
Benjamin Neff
d74e20a790 fetch public posts when someone starts sharing with you 
closes #5960
 2015-05-16 13:54:01 +02:00
Jonne Haß
ca33e984d3 Merge branch 'stable' into develop 2015-05-16 12:48:41 +02:00
Benjamin Neff
30cc330747 fix empty searchable in hcard, parse empty as false 
closes #5962
 2015-05-16 12:48:33 +02:00
Dennis Schubert
42a408045e Merge branch 'stable' into develop 2015-05-16 03:44:35 +02:00
Benjamin Neff
c01fdb6e1c fix the url for the public-posts json 
closes #5958
 2015-05-16 03:44:31 +02:00
Jonne Haß
59e77675ce Merge branch 'stable' into develop 2015-05-10 00:10:19 +02:00
Dennis Schubert
6273c2959a Rescue from private objects sent to the public api 
closes #5938
 2015-05-10 00:10:12 +02:00
Jonne Haß
fc00e94afa Merge branch 'stable' into develop 2015-05-07 22:30:47 +02:00
Jonne Haß
138551112b Fix obtaining sidekiq log path 2015-05-07 22:30:07 +02:00
Jonne Haß
7060840d0f use stdlib logger for FEDERATION_LOGGER, closes #5657 2015-05-04 04:16:31 +02:00
Florian Staudacher
0bb316e893 update bookmarklet 
* snippet now in a separate JS file - compiled and uglified with the other assets
* popup gets centered in opening browser window
* publisher gets pre-filled with markdown-styled content
 2015-05-01 20:20:46 +02:00
Jonne Haß
78ea2c8204 Merge pull request #5878 from Flaburgan/chrome-frame 
Fix the IE version number extractor to work without space between MSIE and the version number
 2015-04-30 13:04:29 +02:00
Benjamin Neff
a863f3ebb2 encode unencoded urls and normalize IDN urls 2015-04-23 00:24:53 +02:00
Flaburgan
2b2c39eef3 Fix the IE version number extractor to work without space between MSIE and the version number, close #5858 2015-04-22 22:09:22 +02:00
Jonne Haß
e7d0a978ba Generate error pages on assets:precompile 
This allows us to reuse any CSS we have, unify
their look and unify their look with the regular
page design.

This works by instantiating ActionView and rendering
templates in a rake task.

Inspired by the errgent gem.
 2015-03-27 11:15:59 +01:00
Steffen van Bergerem
6d070c818c Use jshintrb and guard-jshintrb instead of jshint 2015-03-18 10:49:17 +01:00
Sayed
18a1958ef8 fix too long tag name #5737 2015-03-15 16:15:33 +02:00
Steffen van Bergerem
f5bf53a004 Refactor vendor javascript 2015-03-11 15:51:08 +01:00
Jonne Haß
f525f9e34d Merge pull request #5730 from Flaburgan/strip-markdown-from-title 
Strip markdown from the heading of a post
 2015-03-06 23:43:13 +01:00
Steffen van Bergerem
2a52f65160 Bump markdown-it 2015-03-06 20:40:06 +01:00
flaburgan
5dc8642a99 Strip markdown from the heading of a post. Impact notifications, email subjects, SPV <title>, the Atom feed... 2015-03-04 19:30:00 +01:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Jonne Haß
1a7988caaa Drop asset cache and precompilation on Travis again 2015-03-02 15:32:36 +01:00
Jonne Haß
4d540ce715 Precompile assets on Travis 2015-02-28 12:56:03 +01:00
Jonne Haß
290aded7f6 ActionMailer deliver -> deliver_now 2015-02-27 16:58:39 +01:00
Jonne Haß
6a5a407e49 Strip Unicode format characters prior post processing 2015-02-17 23:29:05 +01:00
Steffen van Bergerem
5fa6b8253e JSHint unused and undefined variables 2015-02-08 23:41:32 +01:00
Jonne Haß
a7d652c7c9 Merge pull request #5530 from dimaursu/emoji 
Convert MySQL fields to 4 byte unicode
 2015-01-21 02:34:53 +01:00
Steffen van Bergerem
b63d8fc679 Fix markdown-it linkify blocking Firefox 2015-01-19 02:09:10 +01:00
Dumitru Ursu
dda5f71124 Add warning about encoding change 
Add warning about MySQL collation

Fix database index length

This allows new databases to be created with utf8mb4, on MySQL. The maximum
column size is 767 bytes. Each character is 4 bytes long -> 767 / 4 = 191
characters for the column.
 2015-01-19 02:19:39 +02:00
Steffen van Bergerem
2541fc74d4 Remove chars from PosixBracketExpressions that js doesn't like 2015-01-10 21:38:03 +01:00
Steffen van Bergerem
026773194a Replace pagedown by markdown-it 2015-01-10 18:56:20 +01:00
Jonne Haß
8c09dc1916 Make tests:generate_fixtures rake task depend on spec:prepare 2014-12-18 19:09:29 +01:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Jonne Haß
120b46931d Disable spring while generating secret token 
That causes a cyclic dependency on spring being
loaded otherwise.
 2014-12-11 20:10:20 +01:00
Jonne Haß
6d682d6c39 Use URI.join to assemble the URL to fetch a single post 
That normalizes any extra / on the base URL.
 2014-12-09 16:21:04 +01:00
Dennis Schubert
cc0c19b482 Merge pull request #5462 from jhass/open_graph_reader 
Bye opengraph_parser, hi open_graph_reader
 2014-12-09 04:42:20 +01:00
Jonne Haß
6836af89ad Correctly implement OpenGraph tags 
Just defining og:site_name indicates that we support the
OpenGraph protocol, but then we didn't set the required
properties.
 2014-12-08 02:25:09 +01:00
Jonne Haß
74a6f42501 Bye opengraph_parser, hi open_graph_reader 
opengraph_parser is basically unmainted, issues are ignored
or deliberately closed without fixing. It pollutes the global
namespace and has no verification of correctness.

The opengraph gem has basically the same issues, not really maintained,
unreleased patches on master since over a year, not really smart either.

So I created my own version and while at it, why not strive try to be
complete and robust, although it's still a work in progress.

This also improves general URL detection by parsing them
from the message after stripping markdown.

An additional dependency was added to support
fetching sites that require cookies to work at all.
For the same reason Faraday's default redirect limit was
bumped.
 2014-12-08 02:01:31 +01:00
Jonne Haß
a580171e32 Replace spork with spring, update & use binstubs 
Spring is the recommended application preloader for rails
 2014-12-01 08:06:07 +01:00
Steffen van Bergerem
f6fbbbb5f6 Move tag prefill to Backbone, add tests 2014-11-30 17:14:05 +01:00
Steffen van Bergerem
55b60f7bde Remove unused files in lib 2014-11-22 21:21:38 +01:00
Dennis Schubert
aec00f834f Add Camo for <img>-tags inside Markdown contents 2014-11-10 02:19:45 +01:00
Jonne Haß
c7c57d40f5 Merge pull request #5380 from Faldrian/feature/3098-publisher-imageupload-layouterror-fix 
Feature/3098 publisher imageupload layouterror fix
 2014-11-09 18:52:13 +01:00
Dennis Schubert
6808150920 Method calling convention and doc improvements 
... and a stealth-commit of an already introduced bug prevention system.
;)
 2014-11-09 07:20:30 -08:00
Dennis Schubert
fd63fca7d5 Add Camo to MessageRenderer#markdownified 
for mobile views
 2014-11-09 07:29:36 +01:00
Dennis Schubert
5c9cc49363 Only RegEx if there is something to RegEx 2014-11-09 02:16:28 +01:00
Dennis Schubert
cca0c9eec4 Some refactorings, safer regex 2014-11-08 23:12:45 +01:00
Dennis Schubert
92cd4e6b78 Use camo for Markdown images 
just a quick proof of concept
 2014-11-08 05:14:18 +01:00
Faldrian
db13811c2c added scrollbar to bookmark publisher, fixed mention layout bugs 2014-11-07 19:17:54 +01:00
Paul Hill
fa9989cecf change x11 to expat license 2014-10-21 15:42:21 +01:00
Paul Hill
f3d1176354 Added more LibreJS support 2014-10-21 15:39:02 +01:00
Jonne Haß
f361a0f885 Merge pull request #5288 from jaywink/remove-old-users 
Maintenance feature to remove old users, scheduled in settings
 2014-10-17 01:00:51 +02:00
Augier
2ce98b49d7 Fix issue #4416 
Conflicts:
	spec/helpers/notifier_helper_spec.rb
 2014-10-16 23:27:48 +02:00
Jason Robinson
69c3566958 Maintenance feature to remove old users 
Add Sidetiq webview to the Sidekiq monitoring panel

Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq

Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.

Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
 2014-10-16 22:53:08 +03:00
Jonne Haß
66c2f7f869 Fix statistics_presenter_spec 2014-10-04 01:01:19 +03:00
Jonne Haß
499ff6e0f4 Fix receiving a relayable retraction through the public route 2014-09-20 15:03:53 +02:00
Jonne Haß
5ca1c1d295 Raise on 404 during Webfinger 
That's at least readable, return false just causes
silly follow up errors
 2014-09-20 13:47:52 +02:00
Jonne Haß
777e3123d6 Try fetching missing parent of relayables 
* Extract post fetching logic from Reshare into
  its own module
* raise proper error message when fetching fails
* raise proper error message when parent is still missing

We can't skip fetch failures or missing parents and
still need to retry them in case we're sent the parent
later on
 2014-09-07 10:47:47 +02:00
Jonne Haß
01e0127287 Ignore embedded photos if invalid 
For example if they're already present
Also refactor StatusMessage XML specs
 2014-09-06 04:52:18 +02:00
Jonne Haß
1b0de7f7cc skip assets precompilation for cucumber run 2014-08-27 18:38:43 +02:00
Jonne Haß
3387bbca74 skip assets precompilation for regular run 2014-08-27 18:37:14 +02:00
Jonne Haß
f772af86a6 Merge pull request #5156 from khall/issue_5040 
Fix for issue 5040
 2014-08-26 01:16:41 +02:00
Jonne Haß
8de29bc28d bump faraday and faraday_middleware. closes #4950 2014-08-25 19:16:55 +02:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
khall
41dc950a06 Adding scope for account_deletion to get only those that are uncompleted and then adding that scope to accounts.rake. Tested it out and it works well 2014-08-24 19:02:11 -07:00
khall
6d3528c539 Fix for issue 5040: Adds completed_at column to account_deletions and sets timestamp upon successful completion. Depends on uniqueness of diaspora_handle when combined with person_id 2014-08-24 17:06:33 -07:00
Jonne Haß
d6d65cd0fd apply rails 4 todos and fix specs after rebase 2014-08-23 16:47:57 +02:00
Jonne Haß
5068be90e8 reduce cuke failures 
* Bump sass-rails (without effect)
* Bump mobile-fu (without effect)
* Cosmetically fix two cukes
* Refactor Taggable#tag_strings
* Rename default.css to default.css.scss (without effect)
* Fix receiving a conversation
* Pass aspect_ids instead of a relation to User#aspects_from_ids
 2014-08-23 16:47:57 +02:00
Jonne Haß
0d42285496 Do not update_attributes with a nil id 
Rails 4 accepts that as a parameter thus setting the id to nil
thus thinking it'd be a new record when we just want to update
it
 2014-08-23 16:38:57 +02:00
Jonne Haß
ceee5baae6 raise original exception in i18n interpolation fallback middleware 2014-08-23 16:34:01 +02:00
Jonne Haß
2d57e15d5d Remove :without_protection from call in the posts fetcher and fix a couple hundreds specs as a side effect 
Heisenbugs ftw.
 2014-08-23 16:34:01 +02:00
Jonne Haß
7e7082a3bd Fix expectations for changes in generated HTML 
Just a minor change, supplied attributes now go before the
standard ones
 2014-08-23 16:34:01 +02:00
Jonne Haß
09f0665225 replace deprecated usages for all 2014-08-23 16:34:01 +02:00
Jonne Haß
2f1193fa36 Fix "prepared statements" errors 
See https://coderwall.com/p/45ombq
 2014-08-23 16:34:00 +02:00
Jonne Haß
a9e107364a make status message controller spec pass and deprecation free 2014-08-23 16:34:00 +02:00
Jonne Haß
2cca5745c9 remove deprecated scoped 2014-08-23 16:34:00 +02:00
Jonne Haß
2f54d4f17d remove conditions on association deprecation warnings 2014-08-23 16:34:00 +02:00
Jonne Haß
89afb616cf replace deprecated scope syntax and unify it 2014-08-23 16:34:00 +02:00
Jonne Haß
33c3b38f2f replace deprecated finder and finder_options syntax 2014-08-23 16:34:00 +02:00
Jonne Haß
d75632401b make everything boot again 2014-08-23 16:34:00 +02:00
Steffen van Bergerem
9e32eb370a Remove unused js code for login page 2014-08-19 09:25:48 +02:00
Jason Robinson
d0b37fa7ee Rescue from an exception when sending emails in podmin:admin_email 2014-08-17 18:14:36 +03:00
Jason Robinson
a4eafe8a87 Allow sending emails with custom subject via Notifier.admin 2014-08-17 18:02:16 +03:00
Jason Robinson
6dd1e31337 Rake task for Notifier.admin to send emails to users 2014-08-17 18:02:16 +03:00
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +02:00
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
Jonne Haß
009209d939 bump Typhoeus and refactor HydraWrapper 2013-05-25 13:45:37 +02:00
Ruxton
48b48470bc Service.delete_post now more generic, for future implementations 
Service.delete_post now accepts post to be more generic and supports deleting post from any service that overrides delete_post(post)
 2013-05-20 12:19:39 +08:00
Maxwell Salzberg
66911801f7 use ActiveRecord#find_each to prevent memory spikes in our workers 2013-05-19 20:33:04 -07:00
Ruxton
ba0e2509c9 Twitter service removes status from twitter when post is revoked 2013-05-20 11:00:49 +08:00
Jonne Haß
ac147cc9f4 Refactor config/ directory 
* Get rid of early pathname requirement
* Use require_relative where approciate
* Drop unused files
* Imported new application.rb, environment.rb and environments/* from fresh Rails app
* Cleaned up boot.rb
* Load config in boot.rb
* Deduplicate environments/integration*.rb
* Move username blacklist into defaults.yml
* Ruby 1.9 Hash syntax everywhere
* Reorganize lib/diaspora/markdownify to match conventions
* Get rid of full path requires where possible
* Add dummy content to production section diaspora.yml.example to prevent warning
* Drop sqlite? method
* Move postgres? method into ConfigurationMethods
* Drop token authentication from User
 2013-05-19 18:54:54 +02:00
Jonne Haß
477c9d2ef3 Revert "Do not pass AR objects to Sidekiq" 
This reverts commit 32935be9b1.
 2013-05-17 17:35:53 +02:00
Jonne Haß
32935be9b1 Do not pass AR objects to Sidekiq 
In the new version Sidekiq calls JSON.generate on the passed arguments, which blows up with AR objects
 2013-05-17 14:44:57 +02:00
Jonne Haß
c41db6634c Fix reading of redis namespace from config 
Changed default to nil to not screw users running develop already
 2013-05-05 16:12:22 +02:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq. 
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
 2013-03-21 23:39:07 +01:00
Jonne Haß
3fc3b249e7 End the require mess 
* Rename and reorganize post fetcher to fix autoloading, also let it use
  Faradays default connection so we get nice redirects
* Add initializer to load libs at a central place
* added lib dir to autoload_once paths to increase thread safety
* Moved lib/exceptions.rb to lib/diaspora/ to conform namespacing
 2013-03-21 23:37:53 +01:00
Juan Manuel Azambuja
78e1f6f251 add assets:preocompile prerequisite for cucumber specs on CI 2013-03-12 12:23:55 -03:00
Jonne Haß
7a89d8b161 only try to delete a post from a service if we're able to 2013-03-01 18:54:01 +01:00
Jonne Haß
7b56c2dd52 Do not fail on receiving a SignedRetraction via the public route 2013-03-01 03:38:36 +01:00
movilla
76b1e9b0dc Add the ability to upload photos from the mobile site 2013-02-26 23:25:58 +01:00
Jonne Haß
ba9aee5902 update changelog; replace "pre" releases with a plain "head" 2013-02-18 20:20:50 +01:00
Jonne Haß
1f4787aa6d Merge pull request #3980 from L3MNcakes/feature/facebook_delete 
Feature/facebook delete
 2013-02-18 11:17:51 -08:00
L3MNcakes
1120cba5f0 Issue #3939: Posts to Facebook do not delete 2013-02-18 18:21:59 +00:00
Jonne Haß
f3093ca8ae Merge pull request #3864 from Raven24/aspect_memberships 
[WIP] aspect membership dropdown Backbone.js rework
 2013-02-17 05:54:12 -08:00
Florian Staudacher
4cbae601e8 [WIP] aspect membership dropdown Backbone.js rework 
* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships

TODO
* more tests
 2013-02-17 13:40:10 +01:00
Fabián Rodríguez
de112300ca remove use csv instead of fastercsv 2013-02-17 12:48:29 +01:00
Jonne Haß
0a124acdf0 Revert "fix regression from #3968" 
Revert "Merge pull request #3968 from marpo60/limit_shareable_from_person_queries"

This reverts commit ddfc558a9b.
This reverts commit 30ed4b4e70, reversing
changes made to f50ce2cb1d.

limiting the fetch of the IDs breaks paginating, there's no quick way to fix that

I left the spec in for future use.
 2013-02-16 23:48:10 +01:00
Jonne Haß
ddfc558a9b fix regression from #3968 
Not ordering the IDs caused incorret ones returned

The spec is totally at the wrong level but I couldn't make
something up that exposed the bug at a deeper level :(
 2013-02-16 23:22:14 +01:00
Fabián Rodríguez
703c52f74c limit ShareablesFromPerson queries to improve performance 2013-02-05 23:35:00 -02:00
Florian Staudacher
0092acd492 re-add hovercards 
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
 2012-12-28 22:37:13 +01:00
Jonne Haß
42a01f3a38 fix regression in 0.0.3.0 (close #3805) 2012-12-27 17:58:18 +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
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Fabián Rodríguez
99abc22403 remove unused methods 2012-11-21 18:26:17 -02:00
Jonne Haß
f1aeecc00b force typhoeus (and thus curl) to use diaspora.yml's CA bundle 2012-11-21 17:28:39 +01:00
Jonne Haß
6302181582 do not define rspec task if rspec is unavailable 2012-10-24 21:49:48 +02:00
Florian Staudacher
f0eacc801b Merge pull request #3611 from MrZYX/feature/cleanup_rake_tasks 
rake tasks cleanup
 2012-10-21 06:33:46 -07:00
movilla
f6f5a62f69 Fix show post Community Spotlight on stream 2012-10-14 00:01:46 +02:00
Florian Staudacher
8678c14735 Merge pull request #3589 from MrZYX/refactor_config 
New configuration system, details: see changelog
 2012-09-30 13:07:40 -07:00
David McMullin
586e23727c add specs for chromeframe 
fix typo in ChromeFrame itself
remove unneccessary chromeframe meta tags from layouts
 2012-09-30 17:04:50 +01:00
Jonne Haß
a0d60e7333 Remove unused rake tasks, make cumber rake file the vanilla one 2012-09-27 17:07:33 +02:00
Jonne Haß
4cebaee4db Remove stats.rake, if you really use it revert this commit and fix it 2012-09-26 20:23:47 +02:00
Jonne Haß
e05c6e8897 drop heroku, heroku_san and associated rake tasks and files 2012-09-26 20:21:20 +02:00
Jonne Haß
89c1fd5f7f query the set url only through #pod_uri in the app 2012-09-26 20:19:37 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
e70e48d6ca some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
Jonne Haß
1277cf92b2 refactor ci scripts 2012-09-23 19:00:52 +02:00
Florian Staudacher
fd27137662 rack expects an array instead of a string, fixes #3499 2012-09-19 13:00:07 +02:00
Florian Staudacher
a3477b7691 move modified (non-upstream) js lib to lib/assets 2012-09-17 12:38:16 +02:00
Jonne Haß
6c1a1ec6d2 it's enviroNment 2012-09-15 18:52:12 +02:00
Florian Staudacher
2e3da0cf05 fix date and guid assignment for fetched posts 2012-09-06 18:16:40 +02:00
Jonne Haß
5372e86d55 update i18n interpolation fallback to use renamed method 2012-09-01 01:07:17 +02:00
Florian Staudacher
8f1204d05a first working version of a 'post fetcher' for remote accounts 2012-08-04 13:22:03 +02:00
Florian Staudacher
f9b54b5c10 make the rake task for cleaning up mixed-case tags more verbose [ci skip] 2012-07-04 22:43:43 +02:00
Maxwell Salzberg
190fceaf5c [SECURITY FIX] please update your pod ASAP 
This is a fix for public messages, where a malicious pod could spoof a message from someone a user was connected to, as the verified signatures were not checked that the object was also from said sender.  This hole only affected public messages, and the private part of code had the correct checks
THX to s-f-s(Stephan Schulz) for reporting and tracking down this issue, and props to Raven24(florian.staudacher@gmx.at) for helping me test the patch
 2012-07-02 10:00:12 -07:00
Florian Staudacher
bff069ab19 tinker with log messages for readability 2012-06-15 17:43:14 +02:00
Florian Staudacher
8f21657179 add all the colors of the rainbow, log into the same file 
and throw in some formatting
 2012-06-15 15:30:49 +02:00
Steven Hancock
2b47848da9 Autoload needs a string, not a Pathname 
fixes #3373
 2012-06-11 15:11:05 -07:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Steven Hancock
99a2865e23 Make hashtags clickable in emails 
Refactor the Redcarpet renderer created in c2bc7272f to parse hashtags
into clickable links (for HTML emails only).
 2012-05-29 10:01:58 -07:00
Steven Hancock
c2bc7272fb Escape hashtags in emails 
Custom Redcarpet renderer to escape hashtags (but not legitimate headers)
in emails before Markdown processing. Prevents hashtags from being rendered
as H1 headers. This also leaves open the possibility of parsing hashtags
into clickable links in the future.

fixes #3325
 2012-05-28 21:31:27 -07:00
Maxwell Salzberg
33efa45ec0 Merge pull request #3298 from diaspora/tags-fix-fix 
fix another hashtag 'inconvenience'
 2012-05-24 12:43:59 -07:00
Florian Staudacher
472340e540 add rake tasks for cleaning up mixed-case hashtags, 
fix querying tagged models, in case multiple tags are found
----
the first rake task will attach all posts tagged with mixed-
case hashtags to their lower-case variant

    $ bundle exec rake migrations:rewire_uppercase_hashtags

the other rake task will remove the - now unused - mixed-case
hashtags from the db

    $ bundle exec rake migrations:remove_uppercase_hashtags

as always, perform a backup first! ;)
 2012-05-24 21:28:35 +02:00
Maxwell Salzberg
8752dd4d58 no more oauth steps, so remove them from the runner and options 2012-05-22 11:06:36 -07:00
danielgrippi
777c037e16 kill rich-media type with fire 2012-05-21 12:33:28 -07:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
danielgrippi
f4c06c8f88 add rounded buttons to the composer flow; slay multi-photo option 2012-05-18 19:46:51 -07:00
Maxwell Salzberg
64dae868fe fix some tests around pubsubhubub 2012-05-17 18:23:40 -07:00
Maxwell Salzberg
af1109dcf7 remove a couple more stray files we dont use anymore, and remove rest-client 2012-05-17 18:23:39 -07:00
Florian Staudacher
49117cc95f make federation logger db creation faster by not migrating but using the schema instead 2012-05-17 21:13:23 +02:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
danielgrippi
871d3cc672 i am dumb. include custom mobile in before_deploy [ci skip] 2012-05-11 17:12:30 -07:00
danielgrippi
81661c883f custom landing page logic for mobile. yay 2012-05-11 17:05:09 -07:00
danielgrippi
f820e37838 use .erb for custom landing page instead of .haml [ci skip] 2012-05-11 02:27:33 -07:00
Dennis Collinson
51b1ade3bc DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages) 2012-05-10 13:53:00 -07:00
Dennis Collinson
efa79a4ad7 Refactor Post Presenter 
and comment presenter
 2012-05-10 12:24:21 -07:00
Jonne Haß
008ed32e9e unambigousify community spotlight query in the multi stream, fix #3196 2012-04-28 12:28:07 +02:00
Jonne Haß
9cb803831f improve webfinger failure handling 
* do not raise if profile xrd isn't found
* error out on a ssl error rather than on the unexpected nil value later
* be more verbose about failed xrd fetches
 2012-04-27 16:53:26 +02:00
Maxwell Salzberg
a58260503f Revert "delegate ruby template picking on reshares so the posts look better" 
This reverts commit 5eb2247191.
 2012-04-26 17:58:38 -07:00
Jonne Haß
2357d9b0f1 update xrd fixture to include namespace and remove namespace before trying to set fields in webfinger profile 2012-04-27 00:05:28 +02:00
Maxwell Salzberg
5eb2247191 delegate ruby template picking on reshares so the posts look better 2012-04-25 18:10:43 -07:00
Maxwell Salzberg
66e9423dc9 more cool seed fixings 2012-04-24 13:48:14 -07:00
Maxwell Salzberg
6c5dafa6e9 cool seed wip [ci skip] 2012-04-24 01:13:57 -07:00
Maxwell Salzberg
8e22d69d8e fix webfinger for (old?) nokogiri syntax 2012-04-11 18:19:14 -07:00
Maxwell Salzberg
2fd0905591 dump more data in invite rake task 2012-04-04 19:08:36 -07:00
Maxwell Salzberg
518d2be1e1 use pretty formatter on CI for great justice 2012-04-03 21:51:18 -07:00
Maxwell Salzberg
f6eec580a0 collect invite tokens here, because why not 2012-04-03 19:57:19 -07:00
Maxwell Salzberg
7a37c0f42a dumb rake task to pipe user emails who have failed invites for 
savekeeping [ci skip]
 2012-04-03 19:01:54 -07:00
Maxwell Salzberg
a5b53717ea small typo fixes, in heroku and seed scripts [ci skip] 2012-04-03 15:02:10 -07:00
Maxwell Salzberg
bb5aa2821d use the built in asset_sync initializer. add a rake task to bootstrap 
heroku and asset sync, which puts the S3 config vars in from your app
config.
 2012-04-03 14:47:33 -07:00
Maxwell Salzberg
b33ee8c688 add asset sync gem 2012-04-02 18:32:35 -07:00
Steven Hancock
95d5c9ca68 Fix Jasmine tests - first pass 
193 specs | 5 failing

The 5 failing specs appear (according to Firebug) to be due to missing
fixtures and/or missing routes in the Jasmine environment. Fixing these
last 5 failures is a task probably best left to a more experienced
Javascript/Jasmine developer.

This commit also moves validation.js and clear-form.js into
app/assets/javascripts and precompiles validation.js
 2012-03-27 18:08:27 -07:00
Maxwell Salzberg
9d26643288 update heroku_san 2012-03-27 15:44:12 -07:00
Justin Thomas
22ac1d96a6 Add Resque.after_fork to correct problem with database connections and remove resque-ensure-connected 2012-03-25 14:39:42 -07:00
Maxwell Salzberg
a2aabeb599 remove ActiveSupport::SecureRandom 2012-03-21 13:49:34 -07:00
Maxwell Salzberg
319b3c4d3b fixed rspec tests, more fit and finish around how the invite code works, 
and improving admin functionality
 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
6b97b8044b small updates, and it looks like we are mostly working 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Stephan Schulz
4d1cb56e47 Allow for white spaces in Rails.root path for the integration rake task 2012-03-06 15:45:45 +01:00
Maxwell Salzberg
bd021bbd91 Correct our general exception handling. 
thanks @mperham! see: http://t.co/Jyt7vV4I
 2012-03-03 16:26:06 -08:00
Maxwell Salzberg
879b3d135a title now updates with switch 2012-02-27 18:40:56 -08:00
danielgrippi
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08:00
Maxwell Salzberg
3e65d39b68 rename some stuff in hydra to make it more clear [ci skip] 2012-02-25 18:19:19 -08:00
Maxwell Salzberg
3874c40084 committed a notes file by accident, sry [ci skip] 2012-02-25 17:00:28 -08:00
Maxwell Salzberg
27a4c1bf2d introduce the idea of Federated::Base. this is mostly just renaming and collasping of different federation modules, but also starting a direct hiearchy of these federation classes to make everything easier to refactor 2012-02-25 16:57:14 -08:00
danielgrippi
37981b71fe MS; DG; adding cucumbers for post templates 2012-02-21 17:31:26 -08:00
Maxwell Salzberg
0ab8ef1d08 basic support for activity streams photos 2012-02-21 15:23:28 -08:00
Maxwell Salzberg
25cf776059 the previous and next posts are now supplied in json of the presenter; give the template creator a default value 2012-02-21 15:23:28 -08:00
danielgrippi
ff875a5b3c DG MS; determine what template to use on the client from the server 2012-02-21 15:23:27 -08:00
Maxwell Salzberg
1f4e255f57 fix logging to work great with non-persisted objects 2012-02-17 14:59:42 -08:00
Maxwell Salzberg
ab727fc846 federation logger now in place. 2012-02-16 17:58:15 -08:00
danielgrippi
f3f2b8ca44 change routes to properly reflect page names (activity/stream). 2012-02-14 11:16:41 -08:00
Maxwell Salzberg
54e8040bfd basic federation profile testing stuff 2012-02-14 10:58:57 -08:00
danielgrippi
32f93a0391 you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-13 19:13:43 -08:00
Pistos
44e6084a29 Gracefully handle unrecognized federated objects so failed Resque jobs don't pile up. 
Conflicts:

	lib/postzord/receiver/public.rb
 2012-02-10 23:30:59 -05:00
danielgrippi
5ecb3e8a50 remove a task that doesnt seem to work 2012-02-10 15:31:46 -08:00
danielgrippi
33fb1222f1 change rake assets:compile_s3 to rake assets:deploy [ci skip] 2012-02-10 15:21:59 -08:00
Dennis Collinson
04bd507025 federated generators take a user 2012-02-09 19:01:01 -08:00
Dennis Collinson
5e26a7e6bb Participate stream query uses participations 2012-02-09 19:01:01 -08:00
Dennis Collinson
14b9f5dc5b move user modules into user namespace. 2012-02-09 19:01:01 -08:00
Dennis Collinson
f3c1eff3e9 Refactor Relayable Creation 2012-02-09 19:01:00 -08:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Sarah Mei
6e9d5f013a Fixes #2820 by disambiguating which Person class we want 2012-02-08 06:19:59 -08:00
Maxwell Salzberg
5425d405d8 try running jammit explicitly before jasmine 2012-02-07 14:59:59 -08:00
Jonne Haß
f83076850b use :absolute => true instead of concatenating the pod url manually in ostatus_builder [ci skip] 2012-02-06 10:18:51 +01:00
Daniel Grippi
a142911a8f Merge pull request #2811 from gandaro/2809-atom-userlink-incorrect 
use guid in atom feed to fix the link
 2012-02-05 20:31:03 -08:00
Dennis Collinson
3991903b56 MS DG DC Participate stream that has things bubble to the top 2012-02-03 17:23:57 -08:00
Jakob Kramer
f7b11ac248 use local_or_remote_person_path in atom feed to fix the author's link [ci skip] 2012-02-03 12:24:13 +01:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
Sarah Mei
5c393e9e4f Refactor relayable specs and add one for retracting the object. Is pending - not complete yet. 2012-02-01 19:46:31 -08:00
Sarah Mei
085d6552b3 Drop comments, likes, and PMs from people who the (post/conversation) owner is ignoring. 2012-02-01 17:52:11 -08:00
danielgrippi
310a0679f1 particpate stream, yo! 2012-02-01 16:05:16 -08:00
danielgrippi
02021584a7 EvilQuery for Participation, refactor comment creation 
you can now create a comment with User#comment!(post, text)
 2012-02-01 15:09:31 -08:00
Maxwell Salzberg
d8bfa52af7 swap order in dispatcher to get less errors posting to services 2012-02-01 14:10:54 -08:00
danielgrippi
01a8cb8e34 evil queries have their own house. 2012-02-01 12:48:28 -08:00
danielgrippi
8b62f82d45 fix error 2012-02-01 12:09:46 -08:00
danielgrippi
6bcf06f578 Refactor multistream query 2012-02-01 12:00:30 -08:00
Jonne Haß
2d98c57cf1 [ci skip] The real issue with GnuTLS is actually a flaw in OpenSSL 
which accepts several server misconfigurations

OpenSSL is very liberal about the order and content of the supplied
cert chain. GnuTLS however is very crucial about it. So to support
GnuTLS we need to tell our community to fix their servers (joindiaspora.com
is broken too). You can check it with
gnutls-cli -V --x506cafile=/etc/ssl/ca-certificates.crt $domain
It will print the certs in the order received and say at the end
if it could be verifed. Note that not only the order is important but
also the content. Many example configurations, especially for Nginx,
include the root cert of the CA in the chain which is wrong.
Note from a GnuTLS maintainer: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%23573736#29

Revert "Fix federation with GnuTLS by passing the ca_file to Typhoeus"

This reverts commit 640a0181ab.
 2012-01-29 00:08:28 +01:00
Jonne Haß
640a0181ab Fix federation with GnuTLS by passing the ca_file to Typhoeus 
How did this ever work? Anyway Diaspora now works with libcurl4-gnutls-dev
which already supports SNI in most distributions and is also the default
for many distros. Everybody should switch to it. Do so by installing it and
then do a gem uninstall typhoeus followed by a bundle to compile it with
GnuTLS
 2012-01-28 01:41:53 +01:00
danielgrippi
4cf48cae6b check for presence in dispatcher 2012-01-27 16:30:02 -08:00
danielgrippi
31bfef9dd2 pass in service_type strings instead of objects to deferred_dispatcher. 2012-01-27 16:05:38 -08:00
Maxwell Salzberg
67432bfaf4 suppress annoying resque errors; add a task to clear Resque failures 2012-01-27 14:57:04 -08:00
Maxwell Salzberg
c100f8bfdd clean up Person scopes, and re-use one in contact controller to deprecate a controller method 2012-01-27 02:23:38 -08:00
Maxwell Salzberg
cc5334ce9a make this scary join a scope [ci skip] 2012-01-27 02:23:37 -08:00
danielgrippi
c133c16dc2 DG MS; don't fetch people or contact objects (you don't need) on multi stream. 2012-01-26 14:52:31 -08:00
danielgrippi
005b165e87 defer dispatching to help app processes not bloat in memory 2012-01-26 13:24:53 -08:00
Maxwell Salzberg
c23e6d9afd dispatcher#post should not take opts 2012-01-26 13:24:53 -08:00
danielgrippi
e170829bf7 pull back less Person objects in the stream query. 2012-01-25 19:40:40 -08:00
Dennis Collinson
b0ef88fb9f WIP convert multiStream query to evilQuery 2012-01-25 19:10:25 -08:00
Maxwell Salzberg
c490224516 change the name of the rake task as we are doing it locally for now 2012-01-25 18:23:49 -08:00
Dennis Collinson
f332610016 Refactor user.shareables_from into evil query class for optimization, possibly broken. 2012-01-25 16:32:18 -08:00
Dennis Collinson
d69953b0d6 enter the idea of the evilquery 2012-01-25 14:20:16 -08:00
Maxwell Salzberg
939383ef32 You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash 2012-01-25 11:22:45 -08:00
Jonne Haß
9c67cd7eb9 collapse Post#last_three_comments and Commentable#last_three_comments, do not double query comments in CommentsController#index for a JSON response, remove spec that tests ordering as it's not deterministic on psql without specified order 2012-01-25 12:44:50 +01:00
danielgrippi
72aee6b2c1 don't use .last(3), use .limit(3) instead. also, don't put an order on an association as it isn't overridable. (this commit minimizes AR object instantiation in the stream) 2012-01-24 23:47:45 -08:00
danielgrippi
eaed3505e4 Don't create share_visibilities for public posts, sans migration of deleting old data. 2012-01-24 16:49:07 -08:00
danielgrippi
52438ffaf2 add unicorn back in. only use one worker process for now. also, move chrome_frame middleware into the correct load path in lib. [ci skip] 2012-01-24 14:56:55 -08:00
Jonne Haß
98bdf68003 do not rely on hoptoad to insert rack ssl 2012-01-22 18:42:06 +01:00
Maxwell Salzberg
dcce2976b5 reset soft so you dont lose your custom homepage when you deploy 2012-01-20 16:37:32 -08:00
Maxwell Salzberg
73655efd53 add precompile rake task for heroku (aliasing our jammit and sass setup) [ci skip] 2012-01-20 15:42:20 -08:00
Maxwell Salzberg
493553f979 working on making heroku_san magical 2012-01-19 19:21:10 -08:00
Maxwell Salzberg
f3120b3d5a add stash to before/after deploy so you dont lose in progress h@x 2012-01-19 19:20:11 -08:00
danielgrippi
f0a698d806 added before_deploy and after_deploy tasks 2012-01-19 19:20:11 -08:00
Maxwell Salzberg
69e81a0dc3 move loading rack ssl to an initializer, so we have EnviromentConfiguration and AppConfig. also, circumvent ssl requirement option is now back" 2012-01-18 17:57:26 -08:00
Maxwell Salzberg
1b3cdbb78a Revert "add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info" 
This reverts commit ed45789403.
 2012-01-18 16:52:13 -08:00
Maxwell Salzberg
e4bb00fa2f Revert "make sure we always have app config in enviroment configuration" 
This reverts commit 23fb1b0a29.
 2012-01-18 16:52:01 -08:00
Maxwell Salzberg
23fb1b0a29 make sure we always have app config in enviroment configuration 2012-01-18 16:44:36 -08:00
Maxwell Salzberg
ed45789403 add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info 2012-01-18 15:50:22 -08:00
Maxwell Salzberg
0a40cdf288 MS DG make share_visibility_converter really defensive :( 2012-01-18 11:48:23 -08:00
Maxwell Salzberg
0edb06eef7 fix for the migration for some linux users, which the AR stubs were not carring over from the migration file to the ShareVisibilityConverter 2012-01-18 09:29:00 -08:00
Maxwell Salzberg
38ad76d9c7 rewrite webfinger client and specs; now this is much easier to maintain. 2012-01-18 01:21:28 -08:00
Maxwell Salzberg
254860bddc SM MS; Read email sent to diaspora-dev for more information about this 
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
 2012-01-17 19:29:01 -08:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Maxwell Salzberg
6e02f61395 MS remove custom resque job logging as it is making heroku very sad 2012-01-16 20:25:56 -08:00
Maxwell Salzberg
467f3b0bda MS TT; Add heroku_san to gemfile, adjust custom heroku rake tasks 2012-01-16 20:25:56 -08:00
Jonne Haß
68fb01b2fd bump typhoeus timeout to 25 seconds too #2590 [ci skip] 2012-01-16 15:20:12 +01:00
Maxwell Salzberg
35676cddac fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more 2012-01-14 00:40:42 -08:00
Maxwell Salzberg
c45057bd94 update settings logic, and heroku rake task 2012-01-13 13:59:34 -08:00
danielgrippi
efe55f395d remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller 2012-01-13 13:50:52 -08:00
Maxwell Salzberg
f937804bb8 tell travis to run rspec files in a random order 2012-01-11 19:17:07 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
Tray Torrance
def764f29f Remove logging:basic before adding logging:expanded 2012-01-09 19:26:33 -08:00
Jamie Wilkinson
c152ecf5a7 Fix typo in 'rake heroku:install_requirements' 2012-01-09 16:38:55 -08:00
Tray Torrance
a35612410f No longer skip false values; quote values so that whitespace is valid. 2012-01-08 23:21:21 -08:00
danielgrippi
64a90a30ef only load photos for a post if photos_count > 0; display 'limited' or 'public' in stream elements; fix small like bug in stream 2012-01-07 14:23:27 -08:00
danielgrippi
1b8f78e006 remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway 2012-01-07 14:23:24 -08:00
danielgrippi
cec2d27204 ported likes logic for the stream over from old branch 2012-01-07 14:23:22 -08:00
Maxwell Salzberg
41ecf2b27d make a method in EnviromentConfiguration to test if newrelic is setup 2012-01-05 18:14:06 -08:00
Maxwell Salzberg
db387b5ed4 MS DC; remove backup.rake as we now use backup' 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
d0184ff6f3 gimme backtraces, travis 2012-01-04 00:25:42 -08:00
Maxwell Salzberg
8b4cb744e6 fix for the messagebusmailer to be happy 2012-01-03 23:31:24 -08:00
Maxwell Salzberg
9de84cbba2 only notify hoptoad if it is configured 2012-01-03 20:03:51 -08:00
Maxwell Salzberg
8a48c5c720 remove extra logging we dont use 2012-01-03 20:03:29 -08:00
Maxwell Salzberg
63cdd93afc the websocket has been completely removed, and replaced for a stub until 
we find a better way to reimpliment it in a  more sane way
 2012-01-03 18:39:54 -08:00
Maxwell Salzberg
43090d38eb AppConfig in heroku can now read array variables 2012-01-03 16:18:51 -08:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Daniel Grippi
ab8fb88e74 Merge pull request #2524 from memarko/patch-2 
Update lib/stream/followed_tag.rb
 2011-12-31 10:51:51 -08:00
danielgrippi
018d516b48 rescue pubsubhubbub error if your pod is offline (resolves issue when posting public posts in dev mode with no internet connectivity) 2011-12-31 13:47:53 -05:00
Maxwell Salzberg
5bbfebdba9 the invite emailer is not multipart...sigh 2011-12-30 20:54:00 -08:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
Maxwell Salzberg
ebf9004f91 update messagebus to latest version of their api 2011-12-19 12:24:25 -08:00
Tray Torrance
dc71396a4d Adds maintenance rake tasks for logrotate and temp file deletion; Adds whenever gem + sample whenever file 2011-12-15 15:18:07 -08:00
memarko
890195b2d8 Update lib/stream/followed_tag.rb 2011-12-14 21:15:58 +01:00
Maxwell Salzberg
f800d50a2b i think this works 2011-12-08 16:32:19 -08:00
Maxwell Salzberg
2282fd35d1 kill no longer used youtube titles code with fire 2011-12-08 16:16:57 -08:00
Sarah Mei
f99dd3683d Add jasmine:ci and cucumber oauth back into travis 2011-12-05 22:26:14 -08:00
Sarah Mei
d245dc91a5 Clearing rake spec before defining it - see if this affects travis 2011-12-05 22:03:24 -08:00
Sarah Mei
c2b22569b0 Let's try a trace on travis and see if it tells us anything useful. 2011-12-05 21:33:36 -08:00
Sarah Mei
d1044298d4 Remove export display for now to see if it affects travis 2011-12-05 21:14:48 -08:00
Sarah Mei
925753e6e4 travis needs to fail faster 2011-12-05 20:50:30 -08:00
Sarah Mei
df06b04d83 Perhaps the bundler prerelease is the reason we're running specs twice? Let's see. 2011-12-05 20:20:48 -08:00
Sarah Mei
085471fb55 Remove default rake task's dependency on spec:fixtures for now, to see if that stops travis from running all the specs twice 2011-12-04 17:46:26 -08:00
Daniel Grippi
8212268b99 Merge pull request #2379 from Robsteranium/patch-1 
guid default of "" never gets set to a secure random hex (in mysql at least)
 2011-12-02 10:47:24 -08:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Robsteranium
08b23d3a7f Condensed as per Daniel's comment 2011-12-02 12:17:24 +00:00
Sarah Mei
03f33f9313 Specify exclusion of fixture and performance separately 2011-11-30 22:14:24 -08:00
Sarah Mei
993b410d95 Fix default rake task so it runs the fixture-generation specs first explicitly. 2011-11-30 21:43:04 -08:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream" 
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
 2011-11-30 22:22:32 -05:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream 
Like stream
 2011-11-30 09:11:17 -08:00