Commits · 4bb5aeb34baa4dbe5a2b438f58bf05afc78953f0 · Milan / diaspora

Oct 20, 2010
- Merge remote branch 'upstream/master' · 4bb5aeb3
  Alec Leamas authored 14 years ago
  
  4bb5aeb3
- Merge remote branch 'upstream/master' · fb70dc8c
  Alec Leamas authored 14 years ago
  
  Conflicts: pkg/ubuntu/diaspora-setup
  fb70dc8c
- Remove remove_all_aspects without ill effect · a01c1c74
  Raphael authored 14 years ago
  
  a01c1c74
- Put database cleaner back in · d3d01821
  Raphael authored 14 years ago
  
  d3d01821
- Clean up some repetition in specs · d98ac701
  Raphael authored 14 years ago
  
  d98ac701
- make user/receive spec less repetitive · 197bd8eb
  Raphael authored 14 years ago
  
  197bd8eb
- user_friending_spec passes again · 74ec629b
  Raphael authored 14 years ago
  
  74ec629b
- Fix a couple more specs · 52f7350f
  Raphael authored 14 years ago
  
  52f7350f
- Starting to remove database-cleaner · 43dd9514
  Raphael authored 14 years ago
  
  43dd9514
- Fixed cucumber features. Backfilled tests for AspectsController#create. · b007ba14
  Sarah Mei authored 14 years ago
  
  b007ba14
- Merge branch 'master' of github.com:diaspora/diaspora · f8400389
  Sarah Mei authored 14 years ago
  
  f8400389
- validation errors in profile and person bubble up to user. · 81ef7386
  Sarah Mei authored 14 years ago
  
  81ef7386
- cucumber feature closer to passing. · 8cf1b836
  Sarah Mei authored 14 years ago
  
  8cf1b836
- changed a bit of text in the invite, also made it show on all aspects now that we have it fixed · d0055cee
  maxwell authored 14 years ago
  
  d0055cee
- fix hcard when parsing friend photo · e7f84f54
  maxwell authored 14 years ago
  
  e7f84f54
- removed empty hash from invite email · f26dc039
  maxwell authored 14 years ago
  
  f26dc039
- added diaspora handle to user profile page · bfe57b13
  maxwell authored 14 years ago
  
  bfe57b13
- added a bit to test email · da95930c
  maxwell authored 14 years ago
  
  da95930c
- mail has some style. couldn't figure out devise mailer templating at the time... · d200aaab
  danielvincent authored 14 years ago
  
  d200aaab
- Return if there is a failure to create a user · 14a5eee4
  Raphael authored 14 years ago
  
  14a5eee4
- Check that time serializes correctly post-parse, not on string equality · 36089149
  Raphael authored 14 years ago
  
  36089149
- header on public explain fancybox · 8751503a
  danielvincent authored 14 years ago
  
  8751503a
- reshare dropdown looks nicer. fixed user menu to drop down on click · f6303b8f
  danielvincent authored 14 years ago
  
  f6303b8f
- Merge branch 'master' of github.com:diaspora/diaspora · 3557d667
  Raphael authored 14 years ago
  
  3557d667
- Merge branch 'import' · 9309be2d
  Raphael authored 14 years ago
  
  Conflicts: spec/models/user/invite_spec.rb
  9309be2d
- Merge branch 'master' of github.com:diaspora/diaspora · 24b136bb
  ilya authored 14 years ago
  
  24b136bb
- another attack vector spec · 4e9e7167
  ilya authored 14 years ago
  
  4e9e7167
Oct 19, 2010
- Point fix: error in diaspora-setup (x2) blocks build. · 8dbd61f1
  Alec Leamas authored 14 years ago
  
  8dbd61f1
- Merge branch 'master' of github.com:diaspora/diaspora · 35a59d39
  danielvincent authored 14 years ago
  
  35a59d39
- Add gzipped source.tar to gitignore · ea36790e
  Raphael authored 14 years ago
  
  ea36790e
- Merge branch 'master' of github.com:diaspora/diaspora · 0a4bf225
  danielvincent authored 14 years ago
  
  0a4bf225
- fancyboxes have title bars now, kind of. · b218a53b
  danielvincent authored 14 years ago
  
  b218a53b
- linking · 53fef63a
  Alec Leamas authored 14 years ago
  
  53fef63a
- Merge branch 'master' of github.com:diaspora/diaspora · d6f8fe10
  Raphael authored 14 years ago
  
  d6f8fe10
- Strip profile names, resolve 357 · 2c66bbbe
  Raphael authored 14 years ago
  
  2c66bbbe
- Linking · 2cf2b5f8
  Alec Leamas authored 14 years ago
  
  2cf2b5f8
- LInking?! · 0096fd11
  Alec Leamas authored 14 years ago
  
  0096fd11
- Docs... · 10f6a699
  Alec Leamas authored 14 years ago
  
  10f6a699
- websocket service cleanup · a0c6c175
  Alec Leamas authored 14 years ago
  
  Complete implementation of the websocket service as a separate SystemV service. Patch to websocket_server.rb to make it support a pidfile. Complete rewrite of the /etc/init.d script for ubuntu. Support in installation scripts.
  a0c6c175
- Merge remote branch 'upstream/master' · d7388469
  Alec Leamas authored 14 years ago
  
  d7388469