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
danielvincent
ec141a2019
a user can add a person to an aspect from getting_started#2
2010-10-26 13:04:47 -07:00
danielvincent
0c72257c50
aspects can be created/destroyed via ajax on getting_started#2
2010-10-26 13:04:47 -07:00
danielvincent
dd4f46c8b0
repositioning layout on getting started
2010-10-26 13:04:47 -07:00
danielvincent
69b1b71a5d
removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers).
2010-10-26 13:04:47 -07:00
danielvincent
f23d199230
added slider to getting started flow
2010-10-26 13:04:46 -07:00
danielvincent
b52afdd93c
changed account and profile partials to better reflect styling changes
2010-10-26 13:04:46 -07:00
danielvincent
31713d9597
html5 placeholder text
2010-10-26 13:04:46 -07:00
danielvincent
278a74f1f9
draft
2010-10-26 13:04:46 -07:00
danielvincent
d8ca91769f
dragging a person to Remove from Aspect on aspect#manage fades person correctly (re: #442 )
2010-10-26 13:03:45 -07:00
danielvincent
7f1d87f424
fixed pagination bug on aspect#show (re: #445 )
2010-10-26 12:57:43 -07:00
zhitomirskiyi
1075c4f96b
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-26 12:22:58 -07:00
danielvincent
ff13cad116
names of people display immediately on aspect#manage page
2010-10-26 12:19:32 -07:00
zhitomirskiyi
e776389d19
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-26 11:19:50 -07:00
maxwell
af917557f6
can't call match on nil
2010-10-25 22:56:50 -07:00
maxwell
cf7a90d0a5
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-25 22:07:11 -07:00
maxwell
a992c5fbc2
dont show service if you dont have the keys for it. also, update deploy script
2010-10-25 22:06:53 -07:00
maxwell
ed99f29a09
dont show service if you dont have the keys for it. also, update deploy script
2010-10-25 22:03:36 -07:00
Sarah Mei
cd67d38a24
Clean checkout: bad idea.
2010-10-25 22:00:33 -07:00
Sarah Mei
69fc293829
CI does a clean checkout
2010-10-25 21:54:13 -07:00
Sarah Mei
33410899d9
Fix for build breakage
2010-10-25 21:38:53 -07:00
danielvincent
a1d00d41e5
deploys back to master
2010-10-25 19:33:23 -07:00
danielvincent
060d8f9c7b
DG MS; fixed some bugs with posting publicly.
2010-10-25 19:24:48 -07:00
zhitomirskiyi
917d1838de
MS IZ specs are green
2010-10-25 18:55:51 -07:00
danielvincent
6ff94e67b3
remove unused fb_config.yml files. removed oauth_keys.yml from git, updated .example"
2010-10-25 17:50:04 -07:00
danielvincent
287d633c44
user#post now handles posting to services.
2010-10-25 17:41:59 -07:00
danielvincent
b2e8ebd0bc
OmniauthService -> Service. Cleaned up views.
2010-10-25 17:41:59 -07:00
danielvincent
3d302f8db7
facebook and twitter both use omniauth and are saved as OmniauthServices
2010-10-25 17:41:59 -07:00
maxwell
c489f49a25
DG beginning to collapse twitter&facebook
2010-10-25 17:41:58 -07:00
maxwell
be39df75fe
removed fb_status from the factories. whoops.
2010-10-25 17:41:58 -07:00
maxwell
fdd222003a
fixed failing specs due to omitted factories.
2010-10-25 17:41:58 -07:00
maxwell
154b6e0ee7
MS DG added specs for posting to twitter, and basic services controller tests
2010-10-25 17:41:58 -07:00
maxwell
d66e986971
removing oauth keys
2010-10-25 17:41:58 -07:00
maxwell
606c7a02a4
MS DG public message now post to twitter, if connected
2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a
twitter oauth dance complete
2010-10-25 17:41:58 -07:00
Alec Leamas
31b3d739c0
Bundle: add licenses, handle git gems
...
Adding a docs dir collexting README and licenses from contained gems.
git gems, which bundler does not handle well today, are handled
by a hacked parsing of Gemfile.log, gem built into the source
bundle and installed on target system
2010-10-26 00:12:15 +02:00
Alec Leamas
76a8ea0e73
new git gem flow using.
2010-10-25 23:19:28 +02:00
Alec Leamas
11b6d61e5a
Merge remote branch 'upstream/master'
2010-10-25 23:19:06 +02:00
Hexagon
1382bd9d08
Fixed header in swedish translation
2010-10-25 21:45:43 +02:00
Hexagon
d617392108
Added/complemented swedish translation
2010-10-25 21:41:32 +02:00
maxwell
b17ae0bf38
DG MS removed unused fb_status model and respective specs, fixtures.
2010-10-25 12:26:08 -07:00
zhitomirskiyi
0e2c20d817
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-25 10:12:11 -07:00
Alec Leamas
66d468c2b2
bugfix
2010-10-25 11:10:00 +02:00
Alec Leamas
1c17069491
bugfix
2010-10-25 10:59:57 +02:00
Alec Leamas
a279bae720
Separate doc dir collecting copyrights and readmes.
2010-10-25 10:34:28 +02:00
Alec Leamas
9b83b07f80
Install from local git gems without download from remote repo.
2010-10-25 10:34:27 +02:00
Sarah Mei
d32d47b790
work in progress cucumber feature for posting messages
2010-10-24 22:57:43 -07:00
root
c5a94c608e
Daemontools installs and starts up mongo
2010-10-25 03:03:11 +00:00
