nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3417 commits 4 branches 0 tags 121 MiB
Commit graph

3417 commits

This branch
This branch
All branches
Author SHA1 Message Date
livefromthemoon@gmail.com
6e1121179d guess locale from browser settings 2010-10-28 17:29:17 +02:00
danielvincent
06654b13b2 posts don't socket into services#index anymore. 2010-10-27 22:55:58 -07:00
danielvincent
dc89d984f1 put remove buttons on incoming requests, allowing a user to ignore again. 2010-10-27 18:36:15 -07:00
danielvincent
59858cd86b opts[:person] set to empty hash only if not already defined. same with opts[:person][:profile]. rake db:reset works properly again. 2010-10-27 18:34:51 -07:00
danielvincent
1d5b7a87f1 Merge branch 'master' into getting-started 2010-10-27 18:14:08 -07:00
danielvincent
db1a753add major hack on getting_started#2 with aspect javascript. reload the page on ajax success on new aspect creation just to get it working. 2010-10-27 18:08:55 -07:00
danielvincent
05c5e770ee removed real name from signup process. 2010-10-27 16:25:22 -07:00
Sarah Mei
314b5d1ef4 ci-19.sh has proper execute perms 2010-10-27 14:34:57 -07:00
danielvincent
bfb1c6df28 collapsed layout views 2010-10-27 13:33:42 -07:00
Sarah Mei
aa0adf47cf Split ci.sh into separate versions for 1.8.7 and 1.9.2 2010-10-27 13:15:25 -07:00
danielvincent
335bd9c96a skip getting started button sets getting_started to false via js and redirects to root_path 2010-10-27 12:53:46 -07:00
danielvincent
b906dd5a1d added redirect to getting_started_path in requests#create 2010-10-27 12:31:48 -07:00
danielvincent
cd726c0ba7 users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/ 2010-10-27 12:21:25 -07:00
Raphael
ae65b7fc9b Merge branch 'master' of github.com:diaspora/diaspora 2010-10-27 11:13:41 -07:00
Raphael
16e455958c Merge remote branch 'hexagon/se-localization' 2010-10-27 11:08:06 -07:00
Raphael
6c94d40bd4 Factory.build saves users 2010-10-27 11:03:57 -07:00
danielvincent
4ec11691cd user has a getting_started flag, set true by default. aspect#index checks to see if getting_started flag is set. 2010-10-27 10:36:13 -07:00
zhitomirskiyi
ebce967550 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-27 10:32:25 -07:00
zhitomirskiyi
a5099bb89f IZ moved methods found in spec helper to helper methods file. now we can include them in the db scripts to keep friending behavior in sync 2010-10-27 10:32:09 -07:00
Raphael
f700eb537a Add activemodel error message for person to en and fr locales 2010-10-27 10:27:30 -07:00
zhitomirskiyi
4a09eb2ece IZ MS update pending aspects controller spec 2010-10-27 10:14:24 -07:00
zhitomirskiyi
634538eff3 IZ MS change back deploy config 2010-10-27 10:13:04 -07:00
zhitomirskiyi
63c740fce7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-27 09:53:50 -07:00
danielvincent
b320f5df72 fixed js for changing a user's profile photo on photos#show 2010-10-27 08:45:43 -07:00
Sarah Mei
8d74aba2ac Merge branch 'master' of github.com:diaspora/diaspora 2010-10-27 03:21:36 -07:00
Sarah Mei
0c8de9460c Fix for 1.9 (no spaces between method name and parens) 2010-10-27 03:21:17 -07:00
danielvincent
039bf374d8 soft shadow on header 2010-10-26 23:38:12 -07:00
danielvincent
a8086f2990 further refinements. added back buttons, more explanation text. 2010-10-26 23:27:26 -07:00
zhitomirskiyi
21c75c08bb removed the http inspect 2010-10-26 19:19:34 -07:00
Raphael
aa819d2113 Putting an index on Person#diaspora_handle 2010-10-26 19:16:16 -07:00
Raphael
49c09b9c8c Remove unused clean_hash 2010-10-26 19:16:16 -07:00
Sarah Mei
601bd91346 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-26 19:05:32 -07:00
Sarah Mei
f314ab39df At some point, we should upgrade database_cleaner to 0.6.0. That point is not now. (It breaks cucumber.) 2010-10-26 19:05:18 -07:00
zhitomirskiyi
c4b79aebc0 mongo query profing 2010-10-26 18:42:53 -07:00
danielvincent
f1fbb68fd8 added success to getting_started. fixed birthday selectors to display years down to 1930. made buttons rounder. all save and continue buttons step forward. 2010-10-26 18:35:14 -07:00
zhitomirskiyi
708927cc6d more debugging on remote, back to 5 sec timeout 2010-10-26 18:31:06 -07:00
zhitomirskiyi
d61ec0186f debugging, trying increasing the timeout 2010-10-26 18:21:47 -07:00
zhitomirskiyi
8b16dd25e7 trying better logging 2010-10-26 18:16:10 -07:00
zhitomirskiyi
0b2e00b7d6 MS IZ the mailer will not be setup unless turned on in the APP_CONFIG 2010-10-26 17:46:19 -07:00
zhitomirskiyi
fa484e95e4 MS IZ refactored querying 2010-10-26 17:05:38 -07:00
danielvincent
385e1673ab Merge branch 'master' into getting-started 
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_account.haml
	app/views/users/_profile.haml
 2010-10-26 16:50:57 -07:00
Raphael
f975199f19 Merge remote branch 'mael/fr-locales' 2010-10-26 16:40:50 -07:00
danielvincent
e62afae045 deselected tabs in top nav, made user drop down a bit clearer 2010-10-26 16:12:58 -07:00
danielvincent
6e015790a7 settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update 2010-10-26 16:02:53 -07:00
zhitomirskiyi
acdbbe4dfc no mail for debugging for now 2010-10-26 15:34:02 -07:00
zhitomirskiyi
c0c8c6253c added a logging line for debugging 2010-10-26 15:13:16 -07:00
danielvincent
ea46fa8fd8 save and continue buttons on getting_started#1 and getting_started#2. raise fields 2010-10-26 15:03:38 -07:00
zhitomirskiyi
1024b8a3a7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 
Conflicts:
	app/controllers/aspects_controller.rb
 2010-10-26 14:57:52 -07:00
zhitomirskiyi
b36ce1ac80 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-26 14:49:52 -07:00
zhitomirskiyi
8acdf21234 MS IZ got rid of the requests for me scope in the user 2010-10-26 14:49:37 -07:00