Commit graph

5006 commits

Author SHA1 Message Date
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
Daniel Vincent Grippi
8a59f3b26e aspect manage less rounded 2010-09-14 20:42:08 -07:00
Daniel Vincent Grippi
c763a663ac z-index fix 2010-09-14 20:37:31 -07:00
Daniel Vincent Grippi
f2c6e7b820 made group manage a little nicer 2010-09-14 20:35:30 -07:00
Daniel Vincent Grippi
d0c8f9ccd6 silent comments on views 2010-09-14 19:54:48 -07:00
Daniel Vincent Grippi
fc3fb817c8 profile photo doesn't change to null if not changed on profile update 2010-09-14 19:48:11 -07:00
Daniel Vincent Grippi
f256d433fd nevermind 2010-09-14 19:34:26 -07:00
Daniel Vincent Grippi
02e1ed82a3 making profiles socket 2010-09-14 19:07:23 -07:00
Daniel Vincent Grippi
3de13d0c19 minor edit 2010-09-14 18:46:37 -07:00
Daniel Vincent Grippi
89d8e86493 added git clone command 2010-09-14 18:27:06 -07:00
Daniel Vincent Grippi
ea0d0cbeb6 link to tracker and wishlist 2010-09-14 18:17:46 -07:00
Daniel Vincent Grippi
d3b24f3dc4 added installation of build tools 2010-09-14 18:10:40 -07:00
Daniel Vincent Grippi
fa947b1036 minor changes 2010-09-14 17:51:35 -07:00
Daniel Vincent Grippi
fb9d504f29 more instructions 2010-09-14 17:17:02 -07:00
Daniel Vincent Grippi
a5c86ac3a7 testing markup 2010-09-14 16:56:47 -07:00
Daniel Vincent Grippi
259143b8fc disclaimer 2010-09-14 16:30:36 -07:00
Daniel Vincent Grippi
2c2cc9c185 atx-style headers 2010-09-14 16:10:31 -07:00
Daniel Vincent Grippi
95169a2fee added agpl license to readme 2010-09-14 15:57:59 -07:00
Daniel Vincent Grippi
b9d28f6d21 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 15:42:49 -07:00
Daniel Vincent Grippi
4d7d9376c4 updates to readme 2010-09-14 15:42:40 -07:00
Raphael
1ee5cebfbe Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-14 15:25:33 -07:00
maxwell
0d37f065dc MS RS fixed a small group adding bug 2010-09-14 15:13:55 -07:00
ilya
8aa39c5f08 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:58:55 -07:00
ilya
0560b46080 MS IZ added friend redirect, and moved the webfinger responces to fixture directory 2010-09-14 11:58:40 -07:00
Daniel Vincent Grippi
3a468a9f1b Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-14 11:45:33 -07:00
Daniel Vincent Grippi
be7c3f28a9 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:43:03 -07:00
Daniel Vincent Grippi
71ef54dbcc spelling mistake, broken links on search page 2010-09-14 11:42:47 -07:00
Daniel Vincent Grippi
426d038aaf Remove email based filter 2010-09-14 11:22:32 -07:00
Daniel Vincent Grippi
7643fb4125 remember that aspects are seeded 2010-09-14 11:15:10 -07:00
ilya
cb12e497f6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:14:10 -07:00
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -07:00