danielvincent
|
7a3d168123
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:17:22 -07:00 |
|
danielvincent
|
09dad2d80f
|
DG MS; exporter includes comments. exporter spec
|
2010-10-07 14:10:14 -07:00 |
|
ilya
|
71610afef8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:04:49 -07:00 |
|
ilya
|
8352a7cf95
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
config/routes.rb
|
2010-10-07 14:04:31 -07:00 |
|
Raphael
|
135ebb7583
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:03:59 -07:00 |
|
ilya
|
7ecc94d7b2
|
added the password route to make email reset password work
|
2010-10-07 14:03:18 -07:00 |
|
Raphael
|
ec9e180eab
|
Merge branch 'master' into HEAD
Conflicts:
public/stylesheets/application.css
|
2010-10-07 13:58:06 -07:00 |
|
danielvincent
|
7e8bf40a87
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 12:21:31 -07:00 |
|
danielvincent
|
8a130a68aa
|
DG MS; xml exporter file added
|
2010-10-07 12:21:14 -07:00 |
|
minilibra
|
ae6f39a0d0
|
Localization file for Indonesian added. Change "en" at the top of both files to "id". Thanks to rsofaer.
|
2010-10-08 02:09:13 +07:00 |
|
Raphael
|
9cbdf78aa7
|
Don't redirect on status message create
|
2010-10-07 12:01:49 -07:00 |
|
Raphael
|
0859d8ebfe
|
Merge remote branch 'jeffry/master'
|
2010-10-07 11:45:39 -07:00 |
|
Raphael
|
e26ad0bdf8
|
topic branch
|
2010-10-07 11:38:07 -07:00 |
|
Raphael
|
4ecf4213f0
|
Merge remote branch 'jbhannah/master'
|
2010-10-07 11:08:39 -07:00 |
|
Raphael
|
e47aa90b15
|
Merge remote branch 'Stigjb/master'
|
2010-10-07 11:06:27 -07:00 |
|
Raphael
|
6ae6d20e4f
|
Merge remote branch 'crimer/master'
|
2010-10-07 10:57:51 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
Raphael
|
0831812e97
|
Merge remote branch 'kashif/master'
|
2010-10-07 10:41:50 -07:00 |
|
Raphael
|
f078bd0a54
|
Merge remote branch 'leamas/perm-fix'
|
2010-10-07 10:09:29 -07:00 |
|
Raphael
|
67fc01aa36
|
Send friend_acceptances correctly
|
2010-10-07 09:49:34 -07:00 |
|
Raphael
|
b6a3549693
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 09:37:00 -07:00 |
|
Crimer
|
56ed245db0
|
MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku.
|
2010-10-07 14:29:17 +00:00 |
|
Alec Leamas
|
0d51af0a13
|
Removing shebang on non-script.
|
2010-10-07 16:11:43 +02:00 |
|
Alec Leamas
|
e9252e8aec
|
After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png
|
2010-10-07 14:59:13 +02:00 |
|
ilya
|
bb6866fa0f
|
removed depricated non-encrypted author info fields from salmon
|
2010-10-06 23:20:28 -07:00 |
|
ilya
|
131e905322
|
fixed the public route
|
2010-10-06 19:05:43 -07:00 |
|
Raphael
|
c74f210464
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:39:12 -07:00 |
|
maxwell
|
8bb454f824
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:38:51 -07:00 |
|
maxwell
|
0fb091ebbc
|
MS pretty sure we dont need to get the oauth path every time we load the public aspect...
|
2010-10-06 18:38:37 -07:00 |
|
danielvincent
|
ee4c197b89
|
fixed hcard finder on image
|
2010-10-06 18:32:56 -07:00 |
|
maxwell
|
c68a026658
|
MS changed the profile edit field to be private
|
2010-10-06 18:19:58 -07:00 |
|
Raphael
|
a315b489f1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:19:38 -07:00 |
|
danielvincent
|
66b356b5fe
|
moved public route
|
2010-10-06 18:14:37 -07:00 |
|
Alec Leamas
|
876a32d64b
|
make-dist handles commit arg, links handles all sources
|
2010-10-07 01:48:44 +02:00 |
|
Alec Leamas
|
5bd5aea484
|
make-dist handles commit arg OK, make-dist list links all sources. Smaller clean-ups.
|
2010-10-07 01:42:33 +02:00 |
|
Alec Leamas
|
09a931d4fd
|
Addding uploads directory
|
2010-10-06 23:15:52 +02:00 |
|
Alec Leamas
|
8ab97fe3f1
|
apache setup update, new diaspora-init
|
2010-10-06 21:53:24 +02:00 |
|
Alec Leamas
|
9c14be8b11
|
prerequisites
|
2010-10-06 19:17:35 +02:00 |
|
Alec Leamas
|
e235c6b537
|
linking
|
2010-10-06 19:12:56 +02:00 |
|
Alec Leamas
|
7a50d537da
|
README wrapup
|
2010-10-06 19:09:51 +02:00 |
|
Alec Leamas
|
1ec99d2839
|
EADME layout
|
2010-10-06 19:04:25 +02:00 |
|
Alec Leamas
|
28d6d418d7
|
renaimng README, to see it properly on github
|
2010-10-06 18:56:46 +02:00 |
|
Alec Leamas
|
03dbe0bb13
|
New workflow w 'rake db:seed:dev'. Permissions on logfiles, logrotate conf. README update
|
2010-10-06 18:53:41 +02:00 |
|
Raphael
|
582b323a7c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 21:05:13 -07:00 |
|
danielvincent
|
6b74053e06
|
scratch that last commit
|
2010-10-05 20:37:28 -07:00 |
|
danielvincent
|
982f51b9c7
|
prepend pod_url to image paths
|
2010-10-05 20:31:40 -07:00 |
|
danielvincent
|
91bbd607e6
|
user avatar in public feed activity:subject
|
2010-10-05 20:27:33 -07:00 |
|
danielvincent
|
dc88110716
|
img tag in hcard
|
2010-10-05 20:22:13 -07:00 |
|
Alec Leamas
|
d172a8ff7f
|
provisionary
|
2010-10-06 05:01:32 +02:00 |
|
Alec Leamas
|
ec9580aaf7
|
provisionary
|
2010-10-06 04:37:03 +02:00 |
|