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

2384 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Raphael
e179ae5b55 Add mention of app_config.yml to readme 2010-09-22 20:52:44 -07:00
Raphael
bfd39b01b6 Readme wording adjustment 2010-09-22 20:50:01 -07:00
Raphael
5fad23c632 Adjust readme wording 2010-09-22 15:53:40 -07:00
Raphael
33317aeeaf Merge branch 'master' of github.com:diaspora/diaspora 2010-09-22 15:53:23 -07:00
Raphael
40afef0763 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	README.md
 2010-09-22 15:52:16 -07:00
danielvincent
16ef43df09 Merge branch 'reposting' of github.com:diaspora/diaspora 2010-09-22 15:50:09 -07:00
danielvincent
4d25fea75e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-22 15:49:56 -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
Raphael
486b9e8bbe Merge branch 'master' into HEAD 
Conflicts:
	README.md
 2010-09-22 15:42:46 -07:00
Pistos
d0dbcd47fc Added a newline after headings where it was missing. 2010-09-23 06:36:55 +08:00
danielvincent
955d9130a2 DG IZ; shift+enter in publisher box submits contents 2010-09-22 15:35:23 -07:00
danielvincent
b9be543ef6 DG IZ; reshare redirects to specific page 2010-09-22 15:32:11 -07:00
Raphael
b03c90f6f2 Merge branch 'master' of git://github.com/tkrehbiel/diaspora 2010-09-22 15:32:02 -07:00
Raphael
695e5fe396 Don't log huge encrypted params 2010-09-22 15:19:26 -07:00
root
ae8c35c352 Merge remote branch 'origin/master' 2010-09-22 18:18:48 -04: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
Thomas Krehbiel
de90923631 Fix for sending unlimited duplicate friend requests 2010-09-22 18:05:11 -04: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
8941975224 DG IZ; example extension convention for app_config 2010-09-22 10:59:23 -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
Diógenes
c87ad060ab Add translation (from English locale) to Brazilian Portuguese 2010-09-23 01:15:10 +08:00
danielvincent
432b7d532d Merge branch 'master' of github.com:diaspora/diaspora 2010-09-22 00:31:30 -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
danielvincent
4c0dc58458 spec cleanup 2010-09-21 20:02:37 -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
0323024fca Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 18:14:54 -07:00
danielvincent
df5b7d6d84 DG MS; new function in post 2010-09-21 18:14:46 -07:00
ilya
d60dc03d35 removed app_config from repo 2010-09-21 18:10:26 -07:00
ilya
96aaf3093c Make load_app_config more robust, point to the right folder in db seed 2010-09-21 18:04:36 -07:00
ilya
662071be08 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 17:52:57 -07:00
ilya
b01928af4b RS IZ if yaml fails to load (empty config) file load the example 2010-09-21 17:52:23 -07:00
danielvincent
c4a86e031d Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 17:43:54 -07:00
danielvincent
4a3bfea1ba DG MS; cleaned spec 2010-09-21 17:43:46 -07:00
ilya
74a92a2637 tiny typo 2010-09-21 17:40:43 -07:00
ilya
e3d52bb467 putting the config file in a shared directory for in the deploy scripts 2010-09-21 17:39:44 -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
ilya
c8e52526d9 another silly mistake, need to symbolize keys in deploy scripts 2010-09-21 16:31:27 -07:00
ilya
dc0a08172d syntax error in seed script 2010-09-21 16:23:42 -07:00