Guido Serra aka Zeph
|
53cda256e2
|
merged
|
2010-09-23 19:59:30 +02: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 |
|
danielvincent
|
e6d1b8b808
|
fixed syntax in welsch translation
|
2010-09-23 10:29:36 -07:00 |
|
Dan Cirnat
|
4be2fdef8f
|
Removed "sample" message from Romanian locale
|
2010-09-24 01:26:31 +08:00 |
|
Dan Cirnat
|
3d1ca6adc8
|
Romanian locale added
|
2010-09-24 01:26:31 +08: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 |
|
Alec Leamas
|
c1242a0984
|
typo fix
|
2010-09-24 01:16:08 +08:00 |
|
Alec Leamas
|
d55c0ae551
|
mongodb now in Fedora repos.
|
2010-09-24 01:16:08 +08:00 |
|
mousey
|
b1dd054fdb
|
More Welsh Localization
|
2010-09-24 01:14:33 +08:00 |
|
mousey
|
1625f6b131
|
Welsh Language Localization.
|
2010-09-24 01:14:33 +08:00 |
|
uiri
|
c711e85c89
|
adding gif support
|
2010-09-24 01:10:46 +08:00 |
|
Raphael
|
f11a481ed7
|
Actually do something
|
2010-09-22 22:59:17 -07:00 |
|
Raphael
|
494f765066
|
fix_diaspora_handle rake task
|
2010-09-22 22:57:53 -07:00 |
|
Steve Conover
|
2a2d126ff3
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-22 22:23:08 -07:00 |
|
Steve Conover
|
5edd054ac7
|
MS Use class_eval because of some sort of load ordering issue
|
2010-09-22 22:22:18 -07:00 |
|
Raphael
|
1964bd5ecf
|
Hit the right thing in aspects move friend
|
2010-09-22 21:57:00 -07: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 |
|
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 |
|
danielvincent
|
7303212784
|
DG IZ; haml typo
|
2010-09-22 17:50:47 -07:00 |
|
danielvincent
|
fc0350e4e1
|
DG IZ; user can post a status update from user edit page to facebook.
|
2010-09-22 17:49:11 -07:00 |
|
danielvincent
|
0c2480c9be
|
DG IZ; quick form in user edit
|
2010-09-22 17:34:57 -07:00 |
|
danielvincent
|
bc70ebdb95
|
DG IZ; quick form in user edit
|
2010-09-22 17:33:57 -07:00 |
|
danielvincent
|
ae58120deb
|
another typo...
|
2010-09-22 17:18:46 -07:00 |
|
danielvincent
|
ddbde60e8c
|
another indent...
|
2010-09-22 17:17:24 -07:00 |
|
danielvincent
|
aef3c8d7bb
|
indent, whoops
|
2010-09-22 17:16:16 -07:00 |
|
danielvincent
|
26478403e2
|
DG IZ; connecting/disconnecting from fb
|
2010-09-22 17:14:58 -07:00 |
|
danielvincent
|
159d72c04c
|
DG IZ; logged in as?
|
2010-09-22 16:56:39 -07:00 |
|
danielvincent
|
53c0aff23d
|
deploy from the right branch
|
2010-09-22 16:34:42 -07:00 |
|
danielvincent
|
fcc681df71
|
DG IZ moved to be APP_CONFIG for host
|
2010-09-22 16:32:52 -07:00 |
|
danielvincent
|
8ed98270a6
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
config/routes.rb
|
2010-09-22 16:09:25 -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 |
|