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

426 commits

Author SHA1 Message Date
Sarah Mei
e3ec00595d Cleaned up file path joining in some of the dev utilties. 
Backfilled tests where necessary to make sure changes didn't break existing code.
 2010-09-25 04:34:48 -07:00
Raphael
f4d18ce9bc don't use request.host as data 2010-09-24 17:12:18 -07:00
Raphael
999d229225 Post photos in either 1.8.7 or 1.9.2 2010-09-24 15:18:30 -07:00
Raphael
950c6a7cab Merge branch '1.9.2' into HEAD 
Conflicts:
	app/models/photo.rb
 2010-09-24 14:36:00 -07:00
Raphael
70a22ae839 Merge branch 'master' into HEAD 
Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb
 2010-09-24 09:15:10 -07:00
Raphael
16b6fc6cdc Don't give exception on webfinger with no query 2010-09-23 17:18:34 -07:00
danielvincent
af91eb51b4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:49:41 -07:00
maxwell
457be4385b Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:39:04 -07:00
danielvincent
c000b31ffb query for post through user 2010-09-23 10:17:13 -07:00
Raphael
2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
 2010-09-22 21:32:03 -07:00
danielvincent
81250c0e9d Merge branch 'master' of github.com:diaspora/diaspora into reposting 2010-09-22 15:49:13 -07:00
danielvincent
e9d16cc09b DG IZ; cleanup 2010-09-22 15:48:50 -07:00
Thomas Krehbiel
10e6ff9df8 Fix for sending unlimited duplicate friend requests 2010-09-22 18:16:10 -04:00
danielvincent
5ef32b7d55 DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial 2010-09-22 12:03:25 -07:00
danielvincent
6dd7911c8c DG IZ; update_or_repost 2010-09-22 10:52:29 -07:00
maxwell
63ed6a3a95 MS DG made async webfingering controller. need to call it from javascript to prevent seeds from blocking. remember to update your gems 2010-09-21 21:31:53 -07:00
ilya
efd901dcd9 RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG 2010-09-21 15:46:57 -07:00
danielvincent
9c334e24e4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 17:26:35 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
maxwell
24ca139241 MS remove some stray puts 2010-09-20 17:11:07 -07:00
maxwell
cb0f0b72eb MS removed a log and trying to be slightly more pedantic 2010-09-20 15:32:18 -07:00
maxwell
5e2fdedf8b MS removed another logging of encrypted data.... 2010-09-20 15:07:30 -07:00
danielvincent
4fe4326ed1 DG IZ photo uploading now works 2010-09-20 15:00:02 -07:00
danielvincent
af9cda52af DG IZ; always query through the current_user in the controllers. 2010-09-20 13:18:11 -07:00
danielvincent
b097f93bf5 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 11:39:17 -07:00
danielvincent
fe306b37ab DG IZ; mass-assignment quick-fix in controllers 2010-09-20 11:30:27 -07:00
Ariel Zavala
6501974f30 added more translations missing on views 2010-09-21 01:43:54 +08:00
Aria Stewart
45b6ff53f1 Ruby 1.9 fixes 2010-09-18 16:35:48 -06:00
Ariel Zavala
58c2d0dd28 merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two) 2010-09-18 02:21:45 -04:00
Ariel Zavala
4558f9901e Added translations to photos and registrations controllers 2010-09-17 18:25:36 -04:00
Raphael
84789f64c9 scope album queries through user 2010-09-17 14:57:14 -07:00
Ariel Zavala
ce3284f1a1 Merge branch 'master' into i18n 2010-09-17 17:28:55 -04:00
Ariel Zavala
7bb3d9c87a Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-17 17:21:29 -04:00
Ariel Zavala
c1c20e14f7 Added translations to requests controller 2010-09-17 17:05:54 -04:00
Ariel Zavala
f95cebcb8b Added translations to new requests view and aspects controller 2010-09-17 16:38:50 -04:00
Raphael
5df33a6fd0 Take out users/show, use current_user in update 2010-09-17 10:50:18 -07:00
Raphael
be26794e4a only write to your own profile 2010-09-17 10:46:14 -07:00
Ariel Zavala
375f4f6808 added more translations missing on views 2010-09-17 10:43:59 -04:00
Raphael
b45906f902 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 21:35:48 -07:00
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
Ariel Zavala
d7e9744e84 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 23:53:18 -04:00
Ariel Zavala
07138041b0 Fixed album controller errors 2010-09-16 23:35:57 -04:00
maxwell
e668071ea5 README.md 2010-09-16 18:48:18 -07:00
Ariel Zavala
db41bcc144 Merge branch 'locale-de' of http://github.com/ccoenen/diaspora 2010-09-16 21:09:11 -04:00
danielvincent
cbb692b6a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Claudius Coenen
64b07fca55 Merge branch 'master' of http://github.com/diaspora/diaspora into locale-de 2010-09-17 00:23:43 +02:00
Claudius Coenen
5197c1b3ec adding localisation for controller's flash messages' 2010-09-17 00:23:35 +02:00
Raphael
feb4cbfd29 Merge branch 'master' of http://github.com/fbrubacher/diaspora 2010-09-16 12:14:11 -07:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00