Commit graph

2715 commits

Author SHA1 Message Date
Jonne Haß
ea792246d0 bump sidekiq 2013-04-25 21:30:35 +02:00
Jonne Haß
322f4da4d8 Embed associated photos into the status message xml 2013-04-21 19:44:09 +02:00
Florian Staudacher
6bcac2a7ad Merge pull request #4117 from MrZYX/script_server
Refactor script/server
2013-04-21 07:25:33 -07:00
Jonne Haß
c8eec463e5 bump configurate 2013-04-20 14:37:41 +02:00
Jonne Haß
aca134d54a Refactor script/server
* Made style consistent
* Add helper functions to print messages
* Abort script if critical command fails
* Made number of started Sidekiq workers configurable again
2013-04-15 17:03:41 +02:00
Jonne Haß
bef8b1ea3c Fix typo in devise initializer 2013-04-15 02:35:53 +03:00
Florian Staudacher
f3aa802a0d remove capistrano from the main source code repo
capistrano deployment scripts will be maintained in a separate deployment repo
2013-04-15 00:50:23 +02:00
Jonne Haß
bef05c14d7 Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop
Conflicts:
	Changelog.md
2013-04-10 18:24:47 +02:00
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02:00
Jonne Haß
be470784c5 add app directory to the autoload paths so that the worker files are loaded in development mode too 2013-04-04 23:32:11 +02:00
Florian Staudacher
19f94fb169 Merge pull request #4095 from embs/feature/3064-add-services-explanation
Add explanation to services index page. Closes #3064
2013-04-04 12:38:50 -07:00
embs
4ef37c64be Add explanation to services index page. Closes #3064 2013-04-04 15:51:11 -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
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
Florian Staudacher
472649f0d7 Merge pull request #4050 from Flaburgan/patch-2
Update en.yml
2013-03-16 04:29:38 -07:00
Antoine D
fa1d0ce68e Update en.yml
Only one sentence was not in future.
2013-03-14 20:42:04 +01:00
Jonne Haß
97a8ff65ba Merge pull request #4048 from marpo60/s3_max_age
Set max-age header to Amazon S3 resources
2013-03-10 06:14:49 -07:00
Marcelo Dominguez
b950c4f171 Set max-age header to Amazon S3 resources 2013-03-08 16:07:56 -02:00
Jonne Haß
43f21d6e55 Pass the real values to stderr_path and stdout_path in unicorn.rb since it runs a case statement on them 2013-03-05 23:37:51 +01:00
Adrián Chaves Fernández (Gallaecio)
3d84467532 Updated the Galician (gl) translation. 2013-03-03 21:15:07 +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ß
f3093ca8ae Merge pull request #3864 from Raven24/aspect_memberships
[WIP] aspect membership dropdown Backbone.js rework
2013-02-17 05:54:12 -08:00
Jonne Haß
1f0f9dabc1 last minute updates to french locale 2013-02-17 14:52:25 +01:00
Jonne Haß
20f6034bbb fix missing quote in javascript.ca.yml 2013-02-17 14:10:37 +01:00
Jonne Haß
3111c805de Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca into develop 2013-02-17 14:08:39 +01:00
Jonne Haß
bfc811d912 updated 112 locale files [ci skip] 2013-02-17 14:08:36 +01:00
Jonne Haß
150f03489a remove obsolete thin.yml 2013-02-17 14:02:33 +01: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
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
Asphyxia
6df84ed703 Fix wrong message on infinite scroll on contact page 2013-01-31 23:09:51 -03: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
fhsdi2
931e4c4f41 Fix uncapitalization of a word 2013-01-26 16:09:34 -02:00
Jonne Haß
b654fb2d02 one unicorn worker should be enough for development 2013-01-26 13:28:40 +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
Fabián Rodríguez
d7574a9efb add locale to aspects 2013-01-16 19:59:10 -02:00
Fabián Rodríguez
29c48ca557 Add ability to toggle aspects 2013-01-16 19:33:19 -02:00
Diaspora Europe
fe2a6b5f85 Write unicorn stderr and stdout log 2013-01-16 13:11:33 +01:00
Jordi Mallach
d795ed2e3e Update Catalan translation to 597ab20. 2013-01-09 01:31:58 +01:00
Jordi Mallach
56357ce0bd Updated Catalan translation to 2d3df3e. 2013-01-09 01:22:25 +01:00
Florian Staudacher
b320e50236 bump Rails to 3.2.11
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
2013-01-09 00:09:07 +01:00
Jonne Haß
38eba6703e add Armenian pluralization rule 2013-01-03 23:32:50 +01:00
Jonne Haß
11f82c794e Bump to Rails 3.2.10 as per CVE-2012-5664
https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
2013-01-02 23:40:46 +01:00
Blaž Hrastnik
d3f5f34fa0 Load the entire lib folder refactor.
Removed hack, replaced with a proper solution.
2012-12-30 13:08:16 +01: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
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00