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

1478 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
Chiggins
f74b0a6f2c Added "shadow text" to caption text field while editing a photo, since about every other text field has "shadow text". 2010-09-25 08:13:16 +08: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
004e659ee1 fix album posting 2010-09-24 15:10:49 -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
40120bb441 Moving to activemodel validations 2010-09-24 11:15:39 -07:00
Raphael
b9bff76054 Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes 2010-09-24 09:49:42 -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
Raphael
d748d456b5 Revert "fix in person partial" 
This reverts commit 8c0bc4b9e6.
 2010-09-23 16:21:08 -07:00
danielvincent
af91eb51b4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:49:41 -07:00
danielvincent
8c0bc4b9e6 fix in person partial 2010-09-23 10:49:35 -07:00
maxwell
40d736d233 MS changed the session page to show APP_CONFIG[:terse_pod_url] 2010-09-23 10:39:47 -07:00
maxwell
457be4385b Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:39:04 -07:00
danielvincent
5d0f4dd587 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:29:50 -07:00
Raphael
95396cd9b2 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:24:17 -07:00
Raphael
ed6df7d1bf Delete user.terse_url 2010-09-23 10:24:10 -07:00
danielvincent
6025bee819 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:17:21 -07:00
danielvincent
c000b31ffb query for post through user 2010-09-23 10:17:13 -07:00
uiri
c711e85c89 adding gif support 2010-09-24 01:10:46 +08:00
Raphael
cc3819c256 Forgot a merge conflict 2010-09-22 21:39:22 -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
danielvincent
b9be543ef6 DG IZ; reshare redirects to specific page 2010-09-22 15:32:11 -07:00
Thomas Krehbiel
10e6ff9df8 Fix for sending unlimited duplicate friend requests 2010-09-22 18:16:10 -04:00
danielvincent
474cf77708 DG IZ; reposting now works. redirects to a template missing page, though. 2010-09-22 15:05:51 -07:00
root
aaa4d75a5e Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-22 16:41:43 -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
maxwell
23e9520a9e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-22 11:33:26 -07:00
danielvincent
6dd7911c8c DG IZ; update_or_repost 2010-09-22 10:52:29 -07:00
Raphael
7049cb3ca4 A less efficient, but simpler way of checking whether the photo is the profile photo 2010-09-22 10:31:40 -07:00
ilya
6bd22034b7 typo in user 2010-09-21 21:45: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
dc0bd363a1 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 20:02:13 -07:00
ilya
6d6ca3d8bc added terse_pod_url to the APP_CONFIG hash 2010-09-21 20:01:56 -07:00
danielvincent
df5b7d6d84 DG MS; new function in post 2010-09-21 18:14:46 -07:00
ilya
76f140aa8b Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 16:59:16 -07:00
ilya
020ff603bd terse_url in user, db seeds are fixed, config/app_config.yml is now in gitignore, copy over config/app_config_example.yml. 2010-09-21 16:59:06 -07:00
danielvincent
03638ee68e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 16:35:25 -07:00
danielvincent
107c05ef6f DG MS; validate_aspect_permissions broken out of post method 2010-09-21 16:35:18 -07:00
root
fe2be748a0 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-21 19:21:40 -04:00
ilya
d26e7850ac RS, IZ; removed url from user and views 2010-09-21 15:52:26 -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
44db21ffd4 DG MS; cleaned up spec 2010-09-21 15:41:29 -07:00
Raphael
95d852b181 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 14:00:12 -07:00
Raphael
11d31901e4 IZ, RS, Pulled receiving out of user file, refactored receive method to be clearer 2010-09-21 13:59:52 -07:00
root
03f8cbc249 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-21 16:59:26 -04:00
ilya
4d00a0e99e IZ posting to all albums should now work, needed to check for all in user.post 2010-09-21 12:35:48 -07:00