danielvincent
|
b08c4fb84e
|
removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)
|
2010-10-31 12:34:26 -07:00 |
|
Raphael
|
fd2fac865b
|
Without typos
|
2010-10-28 18:07:17 -07:00 |
|
Raphael
|
83f8cbbb5c
|
Try fixing db:seed:backer
|
2010-10-28 18:02:06 -07:00 |
|
ilya
|
a60287348d
|
not overwriting app config if it already exists
|
2010-10-22 19:13:35 -07:00 |
|
ilya
|
02c0bf3c43
|
fixed the seed script
|
2010-10-20 14:52:17 -07:00 |
|
Raphael
|
961510a8ed
|
Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build.
|
2010-10-20 11:03:47 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
ilya
|
08b9aa864a
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
|
2010-09-27 15:39:50 -07:00 |
|
Sarah Mei
|
17757a2e2d
|
Merging upstream changes
|
2010-09-25 15:57:59 -07:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Sarah Mei
|
e3ec00595d
|
Cleaned up file path joining in some of the dev utilties.
Backfilled tests where necessary to make sure changes didn't break existing code.
|
2010-09-25 04:34:48 -07:00 |
|
Raphael
|
1f62f910e3
|
fix requires in db seeds
|
2010-09-24 14:43:23 -07:00 |
|
ilya
|
a6c1ff8ce2
|
fixed the deploy scripts
|
2010-09-23 20:21:17 -07:00 |
|
danielvincent
|
8941975224
|
DG IZ; example extension convention for app_config
|
2010-09-22 10:59:23 -07:00 |
|
ilya
|
96aaf3093c
|
Make load_app_config more robust, point to the right folder in db seed
|
2010-09-21 18:04:36 -07:00 |
|
ilya
|
e3d52bb467
|
putting the config file in a shared directory for in the deploy scripts
|
2010-09-21 17:39:44 -07:00 |
|
ilya
|
020ff603bd
|
terse_url in user, db seeds are fixed, config/app_config.yml is now in gitignore, copy over config/app_config_example.yml.
|
2010-09-21 16:59:06 -07:00 |
|
ilya
|
c8e52526d9
|
another silly mistake, need to symbolize keys in deploy scripts
|
2010-09-21 16:31:27 -07:00 |
|
ilya
|
dc0a08172d
|
syntax error in seed script
|
2010-09-21 16:23:42 -07:00 |
|
ilya
|
d3b0b9c07e
|
Make db seed set app_config[:pod_url]
|
2010-09-21 16:13:21 -07:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
bf33313bf9
|
take out index, change backer seed, no puts
|
2010-09-15 17:13:17 -07:00 |
|
Daniel Vincent Grippi
|
ee89bfaf8f
|
removed do bad things
|
2010-09-15 16:18:33 -07:00 |
|
maxwell
|
3a4eb294f8
|
MS made it two callbacks for handles and keys
|
2010-09-15 15:45:26 -07:00 |
|
maxwell
|
16625f4ee9
|
MS removing production stuff from master... yowch
|
2010-09-15 15:31:53 -07:00 |
|
maxwell
|
e375af352c
|
added url to backer script
|
2010-09-15 15:21:52 -07:00 |
|
maxwell
|
78cc51efb4
|
MS DG more emails for person in the seedfile
|
2010-09-15 13:34:06 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
Raphael
|
44a1f82da9
|
Rename group to aspect
|
2010-09-13 10:38:38 -07:00 |
|
Raphael
|
960d40278c
|
Add username, login with username or email
|
2010-09-08 10:59:08 -07:00 |
|
ilya
|
55c43b4498
|
grr, silly comma
|
2010-08-24 16:48:40 -07:00 |
|
ilya
|
b62d76bd66
|
going back to the old simple way of doing things
|
2010-08-24 16:45:38 -07:00 |
|
ilya
|
e65ce0e5c1
|
Mr. Clean! deploy even cleaner, no more silly way of doing things
|
2010-08-24 15:54:02 -07:00 |
|
ilya
|
45f3eb2a9a
|
trying yet again
|
2010-08-24 15:37:55 -07:00 |
|
ilya
|
a70132fcdc
|
IZ we update profile in zombie friends accept
|
2010-08-24 14:22:21 -07:00 |
|
ilya
|
319f87f9a8
|
trying setting profile photos
|
2010-08-24 12:29:00 -07:00 |
|
ilya
|
d32a06c3cb
|
look at the right yaml key
|
2010-08-13 12:47:19 -07:00 |
|
ilya
|
23c57c653f
|
RS, IZ; Trying to speed up cap db reset
|
2010-08-13 12:34:24 -07:00 |
|
ilya
|
ef97b4f19d
|
RS, IZ; updated DB seed to have a group, zombiefriend with a group
|
2010-08-13 11:36:59 -07:00 |
|
ilya
|
6acdde7313
|
fixing the seed script for the refactor
|
2010-08-08 21:42:08 -07:00 |
|
ilya
|
fb4254535d
|
DG IZ; slashes and http in seed script
|
2010-08-08 21:32:09 -07:00 |
|
Raphael
|
bffb63d9f0
|
IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml
|
2010-08-05 14:39:48 -07:00 |
|
ilya
|
5dfc097c88
|
replaced the functionality with openssl, didn't do the encryption spec
|
2010-08-04 20:32:15 -07:00 |
|
Raphael
|
4178a78b23
|
Logger in receive friend request
|
2010-07-16 10:18:45 -07:00 |
|
Raphael
|
cae5700222
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 18:41:01 -07:00 |
|
Raphael
|
501620e9fb
|
DG RS; fixed some visual bugs. request link now turns red on new request
|
2010-07-15 18:40:55 -07:00 |
|
maxwell
|
65deaba558
|
MS IZ hcard, emptyfiles, routesw
|
2010-07-15 18:36:07 -07:00 |
|
Raphael
|
63f27d8a9e
|
Made email relative to subdomain
|
2010-07-15 16:09:15 -07:00 |
|