Kashif Rasul
|
08ddae0894
|
Added devise Arabic locales and moved locale to correct folder.
|
2010-09-29 16:54:33 +02:00 |
|
Jeffry Degrande
|
132eec2c63
|
Merge branch 'upstream'
Conflicts:
app/controllers/aspects_controller.rb
|
2010-09-29 02:11:20 -03:00 |
|
Jeffry Degrande
|
046dbf063b
|
fix i18n => I18n
|
2010-09-29 01:49:35 -03:00 |
|
danielvincent
|
fa8cc5b876
|
moz box shadow does not like negative blur
|
2010-09-28 23:24:04 -04:00 |
|
ilya
|
46bf0cfd99
|
roundtrip done, just need to clean and move to the new api
|
2010-09-28 15:11:01 -07:00 |
|
ilya
|
c7d29b29c8
|
the salmon now encrypts the activity, and stores the aes key in the header
|
2010-09-28 13:22:19 -07:00 |
|
danielvincent
|
f5a57a6f4a
|
photo partial now has labels
|
2010-09-28 13:05:58 -07:00 |
|
danielvincent
|
e0159aaaeb
|
small visual tweaks
|
2010-09-28 12:58:34 -07:00 |
|
ilya
|
6eede48f9f
|
started to refactor the salmon spec, changed data in to be parsed data
to be more clear
|
2010-09-28 12:39:55 -07:00 |
|
danielvincent
|
4627c5338e
|
found placement of all aspects tab confusing; moved it to be the first tab
|
2010-09-28 12:29:35 -07:00 |
|
danielvincent
|
0a34c24f22
|
tag fix
|
2010-09-28 11:51:52 -07:00 |
|
danielvincent
|
577b5545bf
|
comment blocks slide
|
2010-09-28 11:50:13 -07:00 |
|
ilya
|
904143d100
|
rake task to move the private key
|
2010-09-28 11:25:18 -07:00 |
|
danielvincent
|
b068eaf15c
|
limit content width to 600px
|
2010-09-28 10:48:45 -07:00 |
|
danielvincent
|
241ea4559a
|
gradients on aspect tags on status messages
|
2010-09-28 10:41:38 -07:00 |
|
danielvincent
|
bf15514bc9
|
redirect users#public to root_url if user does not exist.
|
2010-09-28 10:23:03 -07:00 |
|
Jesse B. Hannah
|
3e7d4b1db3
|
Fixed mailing list link typo in README.md.
|
2010-09-28 09:55:39 -07:00 |
|
Kashif Rasul
|
0fed72d505
|
Added Arabic locales.
|
2010-09-28 13:57:40 +02:00 |
|
Vincent Batts
|
2aaf16f7db
|
scripts/ubuntu-setup.bash: only count universe as enabled if it's a binary repo and uncommented
Signed-off-by: maco <maco.m@ubuntu.com>
|
2010-09-28 07:50:27 +00:00 |
|
maco
|
0ae0cef769
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2010-09-28 07:19:50 +00:00 |
|
danielvincent
|
263615ad14
|
all status messages have labels
|
2010-09-27 23:51:20 -07:00 |
|
danielvincent
|
79926da3d3
|
removed owner image repeat
|
2010-09-27 23:16:19 -07:00 |
|
danielvincent
|
cb7c35af73
|
fixed thumbnail positioning
|
2010-09-27 23:15:48 -07:00 |
|
danielvincent
|
bf587be461
|
public indicator tag on status message partial.
|
2010-09-27 22:50:11 -07:00 |
|
danielvincent
|
15a4609c14
|
moved user's public route to user controller. changed person.public_url to reflect change.
|
2010-09-27 22:30:16 -07:00 |
|
danielvincent
|
500e6cc4cf
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 22:16:10 -07:00 |
|
danielvincent
|
762646dbe8
|
make the director more forgiving
|
2010-09-27 22:11:14 -07:00 |
|
ilya
|
d8c49e8852
|
moved stuff around in the readme
|
2010-09-27 22:06:47 -07:00 |
|
danielvincent
|
44c29cf8e6
|
deploy_config back to master
|
2010-09-27 21:57:52 -07:00 |
|
danielvincent
|
eac6b8a63b
|
builder is now a class initialized with a user. added director class.
|
2010-09-27 21:54:01 -07:00 |
|
danielvincent
|
58b688aa68
|
fixed builder spec
|
2010-09-27 21:28:21 -07:00 |
|
danielvincent
|
eb7244e07c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 19:07:01 -07:00 |
|
ilya
|
1225291fc2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 19:01:25 -07:00 |
|
danielvincent
|
26a4dc76a6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 18:34:55 -07:00 |
|
danielvincent
|
3b8ddf76a3
|
temp route for atom feed. also, public atom currently displays all posts.
|
2010-09-27 18:34:47 -07:00 |
|
ilya
|
7852c346f2
|
mode the visible posts api more general and moved to it on the public controller
|
2010-09-27 18:31:37 -07:00 |
|
Raphael
|
6100b318e4
|
More accurately describe a spec
|
2010-09-27 18:12:55 -07:00 |
|
danielvincent
|
df800dc87e
|
ostatus builder
|
2010-09-27 17:58:44 -07:00 |
|
Raphael
|
77356d7a17
|
Moving ubuntu-setup.bash to script/
|
2010-09-27 17:55:04 -07:00 |
|
Raphael
|
fad27483cd
|
Pulling in drt24's changes to ubuntu-setup.bash
|
2010-09-27 17:54:20 -07:00 |
|
ilya
|
6e407572c4
|
removed unused repost method, going through the warden object
|
2010-09-27 17:27:49 -07:00 |
|
Guillermo
|
c835814ee1
|
Merging prep_image_url with master
|
2010-09-27 19:20:42 -05:00 |
|
ilya
|
c2b84fd9c6
|
added a public key to post
|
2010-09-27 16:59:54 -07:00 |
|
Raphael
|
efe85a4c28
|
db:reset should call db:seed:dev, not db:seed:tom
|
2010-09-27 16:54:42 -07:00 |
|
Raphael
|
591347a77a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 16:54:18 -07:00 |
|
Raphael
|
e9f433e12f
|
Add spec for not overwriting the image_url on profile update
|
2010-09-27 16:54:08 -07:00 |
|
ilya
|
52313b799b
|
added a warning, moved connected as into a partial, removed the
publishing box from settings page
|
2010-09-27 16:31:19 -07:00 |
|
ilya
|
d41b370630
|
removing the fb feed for now
|
2010-09-27 16:20:27 -07:00 |
|
ilya
|
a8f05244ba
|
localization should be fixed
|
2010-09-27 16:07:24 -07:00 |
|
ilya
|
50234b095b
|
had to move translation around slightly, now the profile edit will be missing a template
|
2010-09-27 16:02:08 -07:00 |
|