Juan Manuel Azambuja
c10aefb30f
Fix email icon on right section
2013-03-28 11:16:18 -03:00
Jonne Haß
8c429c5915
Merge pull request #4083 from marpo60/issue_4081_fix_social_media_icons
...
Add inline-block directive to social_media_icons on publisher
2013-03-28 07:02:08 -07:00
Juan Manuel Azambuja
d68aac88f8
Add inline-block directive to social_media_icons on publisher
2013-03-28 10:52:10 -03:00
Jonne Haß
1b71436c63
revert to old behaviour of only having mysql in the Gemfile.lock, fixes #4080
2013-03-28 00:56:54 +01:00
Fabian Rodriguez
18f260a06f
Merge pull request #4073 from marceloeloelo/fix_getting_started_confirmation
...
Fix confirmation at getting_started page
2013-03-26 15:05:25 -07:00
Marcelo Casiraghi
b0f76f1764
Fix confirmation at getting_started page
2013-03-25 23:09:38 -03:00
Jonne Haß
f956fca494
make all database adapters available in test env, reensure test related rake tasks are available in development env
2013-03-24 13:48:12 +01:00
L3MNcakes
8eed16c245
Issue #3976 : Send a profile update alongside a sharing notification
...
Issue #3976 : Send a profile update alongside a sharing notification
2013-03-24 06:04:47 +00: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
Jonne Haß
13ee6129e5
Merge pull request #4007 from diaspora/update_gems
...
Update gems
2013-03-21 15:10:21 -07:00
Jonne Haß
68a6fa3de7
bump slop
2013-03-21 22:07:32 +01:00
Jonne Haß
ba57fb52f2
bump rails-i18n
2013-03-21 22:07:32 +01:00
Jonne Haß
5869fc27c1
bump rack-piwik
2013-03-21 22:07:32 +01:00
Jonne Haß
e932b506b3
bump omniauth-twitter
2013-03-21 22:07:32 +01:00
Jonne Haß
97393faab3
bump rails_admin
2013-03-21 22:07:32 +01:00
Jonne Haß
c8829a703b
bump nokogiri
2013-03-21 22:07:32 +01:00
Jonne Haß
18c66ac6bf
bump lumberjack
2013-03-21 22:07:32 +01:00
Jonne Haß
39b64bd65b
bump ffi
2013-03-21 22:07:31 +01:00
Jonne Haß
90e1a654ad
bump jasmine
2013-03-21 22:07:31 +01:00
Jonne Haß
c320f59c96
bump fssm
2013-03-21 22:07:31 +01:00
Jonne Haß
3c7007c31d
bump chunky_png
2013-03-21 22:07:31 +01:00
Jonne Haß
47be1191f3
bump coffee-script-source
2013-03-21 22:07:31 +01:00
Jonne Haß
e7ff0448ed
bump foreman
2013-03-21 22:07:31 +01:00
Jonne Haß
cb1f31ae8e
bump timecop
2013-03-21 22:07:31 +01:00
Jonne Haß
802ef60cad
bump twitter
2013-03-21 22:07:31 +01:00
Jonne Haß
61841f22a8
bump jwt
2013-03-21 22:07:31 +01:00
Jonne Haß
05ba4d04e7
bump fog
2013-03-21 22:07:30 +01:00
Jonne Haß
2725ef799b
bump redis
2013-03-21 22:07:30 +01:00
Jonne Haß
8aa4d8e0e8
bump cucumber-rails
2013-03-21 22:07:30 +01:00
Jonne Haß
1e00d8b683
bump selenium-webdriver
2013-03-21 22:07:30 +01:00
Jonne Haß
6159074f61
bump childprocess
2013-03-21 22:07:30 +01:00
Jonne Haß
e5311653a8
bump foreigner
2013-03-21 22:07:30 +01:00
Jonne Haß
c6818617e4
bump faraday
2013-03-21 22:07:30 +01:00
Jonne Haß
283b26cc30
bump rspec-rails
2013-03-21 22:07:30 +01:00
Jonne Haß
d8770731fc
bump font-awesome-sass-rails
2013-03-21 21:25:19 +01:00
Jonne Haß
6677746333
bump safe_yaml
2013-03-21 21:25:19 +01:00
Jonne Haß
871abf8d4b
bump unicorn
2013-03-21 21:25:19 +01:00
Jonne Haß
3855eaf223
bump handlebars_assets
2013-03-21 21:25:18 +01:00
Jonne Haß
10e5bb7b0d
bump guard
2013-03-21 21:25:18 +01:00
Jonne Haß
74599f19fc
bump coderay
2013-03-21 21:25:18 +01:00
Jonne Haß
c1ffc59ddb
bump client_side_validations
2013-03-21 21:25:18 +01:00
Jonne Haß
3430e1f90b
bump sass
2013-03-21 21:25:18 +01:00
Jonne Haß
6813434e91
bump excon
2013-03-21 21:25:18 +01:00
Jonne Haß
669faa042d
bump addressable
2013-03-21 20:50:25 +01:00
Jonne Haß
56a1cc75bb
Merge pull request #4070 from workwareusa/patch-1
...
Update diaspora.yml.example
2013-03-21 11:12:14 -07:00
workwareusa
8745611f33
Update diaspora.yml.example
...
Fixed the wording so admins know invites are either enabled or disabled, and the number of invites is set by default to 25.
2013-03-21 14:30:13 -03:00
Jonne Haß
a55f6fd98c
Merge branch 'hotfix/0.0.3.4' into develop
...
Conflicts:
Changelog.md
config/defaults.yml
2013-03-18 21:10:29 +01:00
Jonne Haß
1a995aa47c
bump rails to 3.2.13, release 0.0.3.4
2013-03-18 21:07:55 +01:00
Jonne Haß
1a58f9cf29
Merge branch 'mobile_comment' of https://github.com/movilla/diaspora into develop
...
Conflicts:
Changelog.md
2013-03-18 20:59:39 +01:00