Daniel Vincent Grippi
|
82ada7d2d6
|
Merge branch 'production' of github.com:diaspora/diaspora into production
|
2010-09-15 15:36:59 -07:00 |
|
Daniel Vincent Grippi
|
cd21ee8652
|
just seed family and work
|
2010-09-15 15:36:41 -07:00 |
|
maxwell
|
c1077b3eed
|
Merge branch 'production' of github.com:diaspora/diaspora into production
|
2010-09-15 14:11:24 -07:00 |
|
maxwell
|
55c1530c9f
|
MS DG fixing an edit profile bug
|
2010-09-15 14:09:05 -07:00 |
|
maxwell
|
b68ec3a5b8
|
MS DG setting diaspora handle in a unclean way
|
2010-09-15 13:53:36 -07:00 |
|
maxwell
|
78cc51efb4
|
MS DG more emails for person in the seedfile
|
2010-09-15 13:34:06 -07:00 |
|
maxwell
|
c57f6b2d9a
|
fixing merge
|
2010-09-15 13:29:39 -07:00 |
|
maxwell
|
84c60e5f2e
|
DG MS fixing webfinger, i hope to goodness
|
2010-09-15 13:28:06 -07:00 |
|
Daniel Vincent Grippi
|
7ed00424c9
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 12:39:07 -07:00 |
|
Daniel Vincent Grippi
|
a925c14310
|
fixing webfinger/salmon
|
2010-09-15 12:35:23 -07:00 |
|
Daniel Vincent Grippi
|
aad24fdfcc
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 12:22:16 -07:00 |
|
Daniel Vincent Grippi
|
57bd052c5b
|
user edit bug
|
2010-09-15 12:22:03 -07:00 |
|
Daniel Vincent Grippi
|
97b0b7b322
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 11:59:51 -07:00 |
|
Daniel Vincent Grippi
|
deac53f178
|
see yourself in aspect sidebar, because you're going to post to yourself anyway
|
2010-09-15 11:59:39 -07:00 |
|
Daniel Vincent Grippi
|
10bbf367ad
|
Merge branch 'production' of github.com:diaspora/diaspora into production
|
2010-09-15 11:55:52 -07:00 |
|
Daniel Vincent Grippi
|
fe35d60b13
|
hack on aspect nav for ff & chrome compatability
|
2010-09-15 11:44:56 -07:00 |
|
Daniel Vincent Grippi
|
1f27c863e4
|
correct roadmap link & added bug tracker link
|
2010-09-15 11:29:22 -07:00 |
|
Daniel Vincent Grippi
|
ac7fb673c5
|
show add new friend links on aspect manage page
|
2010-09-15 11:25:39 -07:00 |
|
Daniel Vincent Grippi
|
ea3e372474
|
fixed 500 error with @photos
|
2010-09-15 11:24:23 -07:00 |
|
Daniel Vincent Grippi
|
5d0f315793
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 11:14:07 -07:00 |
|
Daniel Vincent Grippi
|
56c497eb2a
|
commit guidelines in readme
|
2010-09-15 11:13:45 -07:00 |
|
Raphael
|
1006e8a680
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 11:01:11 -07:00 |
|
Raphael
|
89ac38f630
|
Sass licenses changed
|
2010-09-15 11:00:55 -07:00 |
|
Raphael
|
d9eb3abd9d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 10:59:00 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
db98681538
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 10:27:07 -07:00 |
|
Daniel Vincent Grippi
|
a38a354065
|
moving things around for consistency. consistency isn't pretty right now.
|
2010-09-15 10:26:57 -07:00 |
|
Raphael
|
8c8eb02316
|
Reset albumscontroller
|
2010-09-15 10:20:46 -07:00 |
|
Daniel Vincent Grippi
|
73dab4b3ef
|
fixed stream elements
|
2010-09-15 10:17:37 -07:00 |
|
Raphael
|
5d303518c2
|
Adding in COPYRIGHT, AUTHORS, and blueprint attribution
|
2010-09-15 10:09:42 -07:00 |
|
Raphael
|
d63cc358c5
|
Remerging master and production
|
2010-09-15 09:48:06 -07:00 |
|
Raphael
|
6dff249c73
|
Check for the presence of a password in the deploy config
|
2010-09-15 09:43:59 -07:00 |
|
Daniel Vincent Grippi
|
1d04c89b48
|
header tweak
|
2010-09-15 00:39:48 -07:00 |
|
Raphael
|
a9b587ca06
|
Adding in deploy config for production
|
2010-09-14 22:31:57 -07:00 |
|
Raphael
|
1d94039684
|
put in deploy configs
|
2010-09-14 22:28:13 -07:00 |
|
Raphael
|
a8c9c7d221
|
Putting in deploy config
|
2010-09-14 22:20:37 -07:00 |
|
Raphael
|
fae213eacf
|
Merge branch 'production' of github.com:diaspora/diaspora into production
|
2010-09-14 22:17:29 -07:00 |
|
Raphael
|
c0cac28f7a
|
putting deploy config back in
|
2010-09-14 22:17:12 -07:00 |
|
Raphael
|
f75a189c90
|
putting deploy config back in
|
2010-09-14 22:16:05 -07:00 |
|
Raphael
|
2f823af5aa
|
Adding deploy files back in
|
2010-09-14 22:11:35 -07:00 |
|
Daniel Vincent Grippi
|
b77260af6b
|
Decrement request counter on request action
|
2010-09-14 21:24:57 -07:00 |
|
Daniel Vincent Grippi
|
d9055a73d3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-14 21:17:56 -07:00 |
|
Daniel Vincent Grippi
|
12e15ba3a1
|
forgot a paren
|
2010-09-14 21:17:27 -07:00 |
|
maxwell
|
55f00eb955
|
MS two dumb readme sudo changes
|
2010-09-14 21:16:47 -07:00 |
|
Daniel Vincent Grippi
|
6c2c3d9157
|
working?
|
2010-09-14 21:16:16 -07:00 |
|
Daniel Vincent Grippi
|
aaaa10b7e4
|
more testing
|
2010-09-14 21:12:56 -07:00 |
|
Daniel Vincent Grippi
|
509c16d953
|
debugging js
|
2010-09-14 21:10:10 -07:00 |
|
Daniel Vincent Grippi
|
4a86632cf3
|
show default user photos for requests
|
2010-09-14 20:47:21 -07:00 |
|
Daniel Vincent Grippi
|
3d18914640
|
Merge branch 'production' of github.com:diaspora/diaspora into production
|
2010-09-14 20:45:09 -07:00 |
|
Daniel Vincent Grippi
|
8647220328
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-14 20:44:47 -07:00 |
|