Commit graph

547 commits

Author SHA1 Message Date
Benjamin Neff
5c8f0c1671 create queue callbacks and remove receive routes 2015-12-30 14:50:34 +01:00
Benjamin Neff
24f5244f76 move glue code back to the initializer 2015-12-30 14:48:38 +01:00
Jonne Haß
13029235d0 Merge branch 'stable' into develop 2015-12-13 12:28:04 +01:00
cmrd Senya
922d26f976 Implement integration tests for the federation messages receive feature
These are some initial tests, more to come.

It tests some features of Request, StatusMessage, Comment, Like,
Participation, Retraction, SignedRetraction, RelayableRetraction entities
receive process.
2015-12-13 12:24:52 +01:00
Jonne Haß
e54208d39b Merge branch 'stable' into develop 2015-08-23 11:13:47 +02:00
Steffen van Bergerem
a7287f4f93 Disable the handlebars auto-indent feature
closes #6339
2015-08-23 11:13:42 +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
21e5bd8697 add save callback for webfinger 2015-08-21 14:21:43 +02:00
Benjamin Neff
65b056341c update federation gem 2015-08-21 14:21:42 +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
Benjamin Neff
804784ed3f fix @pod_uri/@pod_url and add url_to to AppConfig 2015-07-14 05:50:26 +02:00
Benjamin Neff
f875be8d5b use federation-gem for webfinger/hcard generation
remove old webfinger/hcard generation code

this fixes #5143
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
Benjamin Neff
46a22fefe9 use federation-gem for webfinger/hcard generation
remove old webfinger/hcard generation code

this fixes #5143
2015-07-10 01:46:48 +02:00
Steffen van Bergerem
9c4f80346b Use entypo-rails mappings 2015-07-03 15:31:29 +02:00
Dennis Schubert
ad52eaf6d7 Merge branch 'stable' into develop 2015-06-08 04:09:57 +02:00
Jan Berdajs
ec4e7b4a69 upgrade Twitter gem - fixes Faraday deprecation warning 2015-06-08 04:08:02 +02:00
efstrian
d64ea15891 Issue #4297: Style fixes - Default theme is configurable 2015-06-07 19:58:14 +03:00
efstrian
57d766346c Issue #4297: Enable color theme setup 2015-06-07 19:57:16 +03:00
Augier
207b6c6153 Port to Bootstrap 3
correcting images display on stream sidebar

Corrections on profile page
2015-06-04 18:05:43 +02:00
Benjamin Neff
b6c46b3fc4 add logging mixin and replace federation-logger 2015-06-04 04:16:03 +02:00
Jason Robinson
d2e0b3ceae Fix Facebook scopes for cross-posting
Facebook deprecated their v1.0 API and thus the old ones no longer work (for new authorizations).

closes #6019 [ci skip]
2015-06-02 02:47:20 +02:00
Sandip Trivedi
36d6c5d2ba Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description
closes #6001
2015-05-28 11:24:30 +02:00
Sandip Trivedi
2ba2ef1b9c Replaces the zipzip gem with the rubyzip gem 2015-05-28 11:23:57 +02:00
Benjamin Neff
b491ecac31 wrap the sidekiq logger to add the context info again
closes #5988
2015-05-25 04:23:28 +02:00
Benjamin Neff
be3b2852be use logging-logger for sidekiq
closes #5975
2015-05-22 02:53:50 +02:00
Benjamin Neff
49f0fb6dcd replace silence_assets.rb with quiet_assets gem 2015-05-22 02:53:19 +02:00
Steffen van Bergerem
ceec5084af Use case insensitive unconfirmed email
closes #5967
2015-05-19 02:58:37 +02:00
Steffen van Bergerem
0c5443d543 Make js-routes use compact and camelcase function names
closes #5941
2015-05-10 02:00:30 +02:00
Jonne Haß
166a152dc0 Merge branch 'master' into stable 2015-05-06 23:53:52 +02:00
Dennis Schubert
d27061d5d6 Set captcha length correctly, fix #5932 2015-05-06 23:51:28 +02:00
Jonne Haß
f1c75e6a54 Bump open_graph_reader
It now returns the origin for a missing og:url
2015-05-04 23:43:53 +02:00
Simon Žlender
bec886109f Issue #5508: Remove post_presenter from initializers 2015-04-25 17:21:07 +02:00
Jonne Haß
179654071b Move default_url_options to application.rb
Apparently the subclasses got loaded before the initializers
were run, thus not inheriting the config.
2015-04-01 14:59:07 +02:00
Jonne Haß
2c7b7bb0dc bump open_graph_reader 2015-03-11 21:59:02 +01:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Jonne Haß
dd45b79a98 Drop Youtube oembed HTTPS hack
upstream ships it now that way
2015-03-02 02:34:51 +01:00
Jonne Haß
3a8302ff7f serve_static_assets was renamed to serve_static_files 2015-02-27 16:58:38 +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ß
c5bc495f3f move sidekiq configuration from initializer to sidekiq.yml 2014-12-01 02:18:28 +01:00
Jonne Haß
3c808142fb let default sidekiq config actually process the maintenance queue 2014-10-22 23:23:14 +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ß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +02:00
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements
Federation improvements
2014-09-27 16:18:37 +02:00
Jonne Haß
2d2217b677 Monkey patch Sidekiq logger
Sidekiq 3.0 initialized the logger early before we had a chance
to set the logfile. Then we set a new logfile causing the old
logger to be closed. Since the default logger points to stdout,
it got closed causing all kinds of issues.
2014-09-20 03:01:43 +02:00
Jonne Haß
9c88fde821 Switch Faraday adapter to typhoeus
It uses curl which has less problems connecting
to a missconfigured IPv6 host (falls back to v4)
2014-09-07 10:47:47 +02:00
jaideng123
1de67281f4 Simplified range check 2014-08-26 14:04:28 -05:00
jaideng123
f53001577e Increase max length of simple_captcha to 12 2014-08-26 13:24:00 -05:00
Jonne Haß
541d5580e0 Fix loading issues in rails_admin
Properly declare Admin module and explicitly list models to be
display in rails_admin
2014-08-26 02:57:47 +02:00
Jonne Haß
8de29bc28d bump faraday and faraday_middleware. closes #4950 2014-08-25 19:16:55 +02:00
Jonne Haß
d6d65cd0fd apply rails 4 todos and fix specs after rebase 2014-08-23 16:47:57 +02:00
Jonne Haß
397606bc44 turn parameter wrapping for AR::B#to_json back on 2014-08-23 16:38:57 +02:00
Jonne Haß
d75632401b make everything boot again 2014-08-23 16:34:00 +02:00
Jonne Haß
59d60ff947 remove strong_parameters initializer 2014-08-23 16:34:00 +02:00
Jonne Haß
72d1ed8f7d bump acts-as-taggable-on 2014-06-01 18:42:51 +02:00
Oliver Azevedo Barnes
aec0c700b3 Add account_deleter.rb to load_libraries initializer 2014-05-07 14:36:18 -05:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer
Introduce message renderer
2014-04-13 15:00:46 +03: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
Fabian Rodriguez
4042e50289 Removes client_side_validations
Conflicts:
	Gemfile
	Gemfile.lock
2014-02-23 16:48:47 +01:00
arlogn
1563d088bc embedding youtube videos over https 2014-01-30 18:01:27 +01:00
Jonne Haß
15b1dae362 update devise to 3.2 2014-01-15 12:59:59 +01:00
maruf
c17a474142 Simple captcha for signup page 2014-01-06 22:00:37 +02:00
Fabian Rodriguez
6c8c4fc99e remove template picker functionality 2013-12-03 20:53:00 -02:00
Fabian Rodriguez
e7ee7892ee Add ActsAsTaggableOn::Tag to excluded models in rails_Admin
Fixes #4538
2013-11-24 11:51:39 -02:00
Fabian Rodriguez
5ed5b1f8ce remove trailing whitespaces and indent rails_adimn initializer 2013-11-24 11:51:39 -02:00
Jonne Haß
ad20a8487b bump ruby-oembed 2013-09-19 23:39:13 +02:00
Jonne Haß
5a821efa18 hardcode default(=fallback) language 2013-09-18 22:14:47 +02:00
Jonne Haß
769bc5ce90 update devise to 2.2.4 2013-08-08 15:40:46 +02: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
James Fleming
9ca9a6f310 Remove duplicates and bad code habits.
Remove some blank line.

Do not chain bang methods.
2013-08-02 11:39:24 +02:00
carolina
143a970e61 Added strong_parameters gem to Gemfile and created an initializer in config 2013-08-02 11:39:05 +02: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
J. Fleming
b75bb8dc0a Change devise config and templates to make logout a delete request. 2013-07-17 21:00:18 +02:00
Jonne Haß
c6d158bd81 move asset_sync require to the earliest point possible 2013-06-13 20:57:38 +02: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
Ruxton
4f1bfd7eea oembed_providers.yml added for custom (outside of ruby-oembed) oEmbed providers. 2013-05-07 09:38:30 +08:00
Ruxton
f6e31fdd95 Merge branch 'develop' of https://github.com/diaspora/diaspora into develop 2013-05-07 09:37:05 +08:00
Braulio Martinez
00a3332013 Remove unnecessary ruby187 hacks 2013-05-02 10:07:30 -03:00
Ruxton
694fc01124 Added MixCloud oEmbed to oembed_providers_list 2013-04-29 12:11:11 +08:00
Greg Tangey (Ruxton)
9f66e32cce MixCloud oEmbed support
Adding support for MixCloud oEmbed
2013-04-26 15:25:08 +08:00
Jonne Haß
bef8b1ea3c Fix typo in devise initializer 2013-04-15 02:35:53 +03:00
Jonne Haß
92a2a9189d bump sidekiq and cleanup unicorn.rb 2013-04-04 20:42:41 +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
Marcelo Dominguez
b950c4f171 Set max-age header to Amazon S3 resources 2013-03-08 16:07:56 -02:00
Jonne Haß
b8128d356b Merge branch 'hotfix/0.0.2.4' into develop
Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb
2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28 Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948
From a quick look at the for us available databases this was not actually used in the wild.
2013-02-01 22:20:31 +01:00
Jonne Haß
cba76060bf ensure our locales are at the bottom of the load path, fixes #2614 2013-01-31 16:41:09 +01:00
Ruxton
40fdf3819b Added DailyMotion & Twitter oEmbeds 2013-01-25 22:31:44 +08:00
Ruxton
89042078ca Oembed Update - Added instagram, better display for rich/photo 2013-01-22 22:37:36 +08: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
Dennis Schubert
ba5b779cd0 Make Devise remember the session for 2 weeks. Fix #3472 2012-11-06 22:24:57 +01:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Jonne Haß
5c7a9c1ce6 Release cleanup, closes #3620
* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
2012-09-30 22:26:23 +02:00
Jonne Haß
234b76a936 properly integrate asset_sync 2012-09-26 20:23:45 +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ß
6c1a1ec6d2 it's enviroNment 2012-09-15 18:52:12 +02:00
Jonne Haß
48dcccf7b3 Unify redis initialization
REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.
2012-09-15 18:23:22 +02:00
Jonne Haß
3e935e1104 use present to check if redis_url is empty 2012-09-12 22:30:08 +02:00
Jonne Haß
70a9218ea5 add thread_safe true to redis initialization because resque does it too now 2012-09-12 22:17:14 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +02:00
Jonne Haß
d27408d8a9 set perform_deliveries, this should fix #3524 2012-09-07 21:46:13 +02:00
Lawrence Leonard "Larry" Gilbert
37b6045c04 Clarify warning shown when single_process_mode used in production 2012-07-04 18:02:40 -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
danielgrippi
72d2f619fc added GA back into rack; added mixpanel configuration options 2012-05-30 13:30:28 -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
75277b4d0e gzip outgoing stuffs for great success 2012-05-24 13:02:20 -07:00
Maxwell Salzberg
980ec78b7b fix piwki loading [ci skip] 2012-05-23 11:03:02 -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
Maxwell Salzberg
d069865c42 upgrade carrierwave to 0.6.2 2012-05-17 18:51:12 -07:00
Maxwell Salzberg
455dc34eae remove hotlink controller, just rewrite those landing assets 2012-05-16 15:02:59 -07:00
danielgrippi
d7a099dadb add publish_actions to facebook connection [ci skip] 2012-05-15 14:07:34 -07:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Dennis Collinson
927b78b79d kill references to ServiceUser 2012-05-14 18:47:14 -07:00
Maxwell Salzberg
379df76118 Update to faraday-middleware, as faraday stack has been deprecated.
Hopefully this will make REE happy in Travis
2012-05-14 15:59:07 -07:00
Maxwell Salzberg
ad6151c808 Revert "@joshsusser hates our ci setup, /cc @suss"
This reverts commit cbca19b3f5.
2012-05-14 15:59:06 -07:00
Steven Hancock
b16f309aca Upgrade Rails Admin to latest gem
This gives us a clean fix for the Kaminari vs. Will Paginate
issues and fixes a few other little bugs in Rails Admin.

fixes #3210
2012-05-11 03:32:05 -07:00
Steven Hancock
4c644c336b Actually only load rails admin in production mode
This is what I think 28f8db51e7 was supposed to do.

With the initializer in an "unless Rails.env.production?" block
the entire initializer was being ignored in production mode and
loaded in all other environments, but Rails Admin was still
loading regardless of that. 😁

This only loads rails admin in production and excludes it from
all other environments. Also keeps non-admins out of /admin_panel
(without the initializer it was free-for-all) and temp fixes #3210
until a new gem is released.
2012-05-09 11:46:18 -07:00
danielgrippi
0ec364e44c DG MS; popup on services, inlined in the composer 2012-05-08 18:09:33 -07:00
Jonas Lundqvist
819bb95dbd reorder so integration2 connects to correct redis port 2012-05-08 11:20:56 +02:00
danielgrippi
5821a84024 validations and all that jazz [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
fe49579ff5 remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked)
i've submitted an issue to the gem.  hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
2012-05-01 18:02:25 -07:00
Maxwell Salzberg
d22a98cd96 monkey patch to_xs for ruby 1.8, and fix a test as a result 2012-04-25 11:38:42 -07:00
Dennis Collinson
e55073fdd4 temp reverting to prove max wrong.
Revert "killing rails admin to investigate if its what's causing boot and deploy to be so slow"

This reverts commit 78bcb1c321.
2012-04-24 16:45:25 -07:00
Dennis Collinson
78bcb1c321 killing rails admin to investigate if its what's causing boot and deploy to be so slow 2012-04-24 16:30:31 -07:00
Maxwell Salzberg
28f8db51e7 only load rails admin in production mode 2012-04-24 13:48:14 -07:00
Maxwell Salzberg
63616c5ced trying this on for size again; Revert "I can't test this at this momement. I will put it back in once i have a"
This reverts commit 53304df740.

Conflicts:

	config/initializers/airbrake.rb
2012-04-19 21:02:29 -07:00
Dennis Collinson
8cc5f86298 reverting some test env munging
max isn't a princess
learn2git
learn2bash
lulz
2012-04-19 14:59:33 -07:00
Dennis Collinson
cbca19b3f5 @joshsusser hates our ci setup, /cc @suss
Revert "silence asset noise in development.  Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea."

This reverts commit 1307907330.
2012-04-19 14:43:19 -07:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Maxwell Salzberg
1307907330 silence asset noise in development. Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea. 2012-04-18 17:26:27 -07:00
Maxwell Salzberg
24b69236a0 exclude share vis in rails admin, dont exclude users [ci skip] 2012-04-15 17:58:49 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -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
4ba3ec0b42 update initializer 2012-04-02 18:43:18 -07:00
Maxwell Salzberg
b33ee8c688 add asset sync gem 2012-04-02 18:32:35 -07:00
Maxwell Salzberg
2da0c0f585 never use s3 in the test env ::sigh:: 2012-03-29 16:11:32 -07:00
danielgrippi
e19c84b5a3 remove the monkey patch that didn't work. 2012-03-21 13:58:20 -07:00
danielgrippi
03409495f9 better patch for ActiveSupport 2012-03-21 13:50:24 -07:00
danielgrippi
9c0ed946a7 no more rspec failures; and suppress a warning with a backported
monkeypatch
2012-03-21 13:50:24 -07:00
Maxwell Salzberg
835f808e5a more progress 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
35a6f4f265 basic 3.1 upgrade... a few things are still broken. help me out and run the tests and fix them <3 2012-03-21 13:50:24 -07:00
Jonne Haß
3c23364fbc refactor locale initialization and selection a bit 2012-03-21 19:25:47 +01:00
Diaspora Europe
d626148a83 fix will paginate renderer 2012-03-16 18:58:01 +01:00
Daniel Grippi
39ee27acf0 Merge pull request #3003 from diasp/will-paginate-bootstrap
mobile: added will paginate for bootstrap
2012-03-15 12:09:29 -07:00
Florian Staudacher
7b4c377df1 make tests happy 2012-03-15 19:44:18 +01:00
Florian Staudacher
e6b403434f some restructuring around oembed providers 2012-03-15 18:34:47 +01:00