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
danielvincent
ff13cad116
names of people display immediately on aspect#manage page
2010-10-26 12:19:32 -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
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
maxwell
b17ae0bf38
DG MS removed unused fb_status model and respective specs, fixtures.
2010-10-25 12:26:08 -07: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
danielvincent
a9451d19b9
another publisher fix (broke aspect#show pages with last fix). changed flash message colors/opacity.
2010-10-24 18:16:38 -07:00
danielvincent
26cada5866
ff 3.6 publisher fix.
2010-10-24 18:01:38 -07:00
root
30955d0100
Unify into one centos cookbook (people will want other OSes) and get mongo and ImageMagick installed
2010-10-24 23:21:01 +00:00
danielvincent
7b3f6f66c1
removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments.
2010-10-24 14:44:43 -07:00
danielvincent
661ad20a02
added delegate, proper finders, and more chaining to stream.js. removed div.comment_set from the DOM.
2010-10-24 14:44:43 -07:00
ilya
ff3dad2bff
adding assertion to album_spec many association
2010-10-24 14:03:03 -07:00
Alec Leamas
f07bcb19da
Merge remote branch 'upstream/master'
2010-10-24 21:28:09 +02:00
root
acc9c116e5
Add a cookbook to run after bundling to install everything
2010-10-24 19:22:15 +00:00
Michael Sofaer
8b38b87c6c
event machine needs C++
2010-10-24 11:56:07 -07:00
root
cd913887d8
Bootstrap recipe for Centos
2010-10-24 18:40:05 +00:00
Alec Leamas
993e5613c6
Merge branch 'v2_clean'
2010-10-24 16:47:57 +02:00
Alec Leamas
6f4682cce7
Establish proper workflow w bundle package + bundle install.
...
make-dist now creates the bundle using 'bundle package', the
rpm files for Fedora ande install scripts for ubuntu installs
using 'bundle install'. This is the way bundler is intended to
work.
Bugs: bundler requires that shipped packages are built, altough
this is done in target system anyway. bundler also downloads
git gems from repo despite that they are already in cache on
target system.
2010-10-24 16:44:29 +02:00
Alec Leamas
f5f707d3e6
Merge branch 'v2_clean'
2010-10-24 16:27:16 +02:00
Alec Leamas
df8bcdf663
Establish proper workflow w bundle package + bundle install.
...
make-dist now creates the bundle using 'bundle package', the
rpm files for Fedora ande install scripts for ubuntu installs
using 'bundle install'. This is the way bundler is intended to
work.
2010-10-24 14:55:49 +02:00
Alec Leamas
1a0fcd1500
Merge remote branch 'upstream/master'
2010-10-24 14:21:52 +02:00
Alec Leamas
020f77289a
Merge branch 'v2'
2010-10-24 14:14:15 +02:00
Alec Leamas
9df1d526eb
bugfix
2010-10-24 14:14:02 +02:00
