ilya
e3ffd2ffe7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 18:26:06 -07:00
ilya
b31b2de6f5
MS IZ aspect add and delete for a person
2010-10-19 18:25:59 -07:00
Raphael
14a5eee41c
Return if there is a failure to create a user
2010-10-19 17:29:22 -07:00
Raphael
360891496e
Check that time serializes correctly post-parse, not on string equality
2010-10-19 17:09:52 -07:00
danielvincent
8751503aa4
header on public explain fancybox
2010-10-19 16:28:45 -07:00
danielvincent
f6303b8fff
reshare dropdown looks nicer. fixed user menu to drop down on click
2010-10-19 16:16:46 -07:00
Raphael
3557d66749
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 16:07:03 -07:00
Raphael
9309be2d69
Merge branch 'import'
...
Conflicts:
spec/models/user/invite_spec.rb
2010-10-19 16:06:48 -07:00
ilya
24b136bbd9
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 15:42:51 -07:00
ilya
4e9e716783
another attack vector spec
2010-10-19 15:42:40 -07:00
Alec Leamas
8dbd61f167
Point fix: error in diaspora-setup (x2) blocks build.
2010-10-19 23:39:22 +02:00
danielvincent
35a59d3982
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 14:07:09 -07:00
Raphael
ea36790e21
Add gzipped source.tar to gitignore
2010-10-19 14:06:57 -07:00
danielvincent
0a4bf225d0
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 14:06:51 -07:00
danielvincent
b218a53bf7
fancyboxes have title bars now, kind of.
2010-10-19 14:06:44 -07:00
Raphael
d6f8fe106a
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 13:51:43 -07:00
Raphael
2c66bbbe00
Strip profile names, resolve 357
2010-10-19 13:51:31 -07:00
danielvincent
8c92c31323
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 12:29:34 -07:00
danielvincent
0621aa2f6c
fixed no friends/posts message positioning
2010-10-19 12:28:54 -07:00
Raphael
962f282cbc
Validate uniqueness of aspect name, 359
2010-10-19 12:23:24 -07:00
danielvincent
d87345ca33
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 12:10:36 -07:00
danielvincent
ea00d35f1f
padding on stream fix. added add aspect button in aspect nav.
2010-10-19 12:10:22 -07:00
Raphael
d68644c358
Resolve #387
2010-10-19 11:47:43 -07:00
Raphael
296afdc871
Beat Dan at bugfixing
2010-10-19 11:43:10 -07:00
Raphael
9f653e39f1
Fix bug 376
2010-10-19 11:39:52 -07:00
Raphael
de0b240dbb
Remove unused helper method
2010-10-19 11:36:33 -07:00
danielvincent
3866b83dab
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 11:29:47 -07:00
danielvincent
7e9585c5f0
default user picture change. stream link on all aspects page fix. layout view is not fragmented.
2010-10-19 11:29:29 -07:00
Raphael
fce902821b
Remove downcasing of diaspora_handle, verify that diaspora_handle querying and validation is case insensitive.
2010-10-19 11:06:43 -07:00
Raphael
adb559155a
Revert change from ps ax to pgrep, pgrep isn't on every computer
2010-10-19 10:29:23 -07:00
Raphael
2893c3766b
Delete em-webfinger file from other branch
2010-10-19 10:09:04 -07:00
Alec Leamas
d8fc7d572e
Pkg updates: separate wsd pkg, bad Gemfile.lock mgmt, docs, fixes
...
For fedora, splits off the wsd daemon in separate package. Overall,
tools to handle bad Gemfile.lock: README notes, -f option to invoke
'bundle update' in make-dist.sh. Handling of missing libmozjs in
Ubuntu 10.04 (https://bugs.launchpad.net/ubuntu/+source/mongodb/+bug/557024 )
Various fixes & typos.
2010-10-19 14:29:20 +02:00
Alec Leamas
fcd70ce152
Add a configuration file
...
Adds a config file with environment and default thin
options
2010-10-19 08:26:43 +02:00
Alec Leamas
ed8878c72a
Allow script to be invoked from anywhere, or symlink target.
2010-10-19 08:26:43 +02:00
Alec Leamas
bb67b1231b
Test availability of thin and websocket ports before start.
...
Improving cmd line scanning, handling thin options in front of
-p <port>. Also clean up test usage, just use if/then and [].
2010-10-19 08:26:43 +02:00
Alec Leamas
e7efd5fbf7
Compress source.tar
...
Compress source.tar, reducing overall distributed source size with
about 30%. Also, actually push this branch ;)
2010-10-19 08:26:42 +02:00
maxwell
8ada8414c7
username can be any case, but diaspora handle should always, always, ALWAYS be lowercase, for webfinger reasons
2010-10-18 22:55:09 -07:00
ilya
8894fa4daa
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-18 16:28:57 -07:00
ilya
d642928268
invite sends friend request if already friends, and raises if already friends
2010-10-18 16:27:02 -07:00
Raphael
676e802fd2
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-18 15:46:44 -07:00
Raphael
b681850783
Get rid of warning/error on invites/_new partial
2010-10-18 15:46:14 -07:00
ilya
7ab2b00231
moved fb posting into the user model
2010-10-18 14:50:48 -07:00
ilya
a8bf082e35
The invitation now has an optional personal message
2010-10-18 14:35:41 -07:00
Raphael
41a0718fc2
Don't overwrite existing pod_url in db:seed:dev
2010-10-18 12:56:22 -07:00
Raphael
eeea57d307
Case sensitivity...
2010-10-18 12:43:04 -07:00
Raphael
244accc9a9
flash error on friending self
2010-10-18 12:11:32 -07:00
Raphael
f90d38bb9c
Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge
2010-10-18 12:00:20 -07:00
Raphael
3436371a96
Merge remote branch 'archi/332-quickfix'
2010-10-18 11:44:47 -07:00
Raphael
8e4691b9d0
Merge remote branch 'rmaskey/269-album-link'
2010-10-18 11:27:13 -07:00
Raphael
d38316002e
Merging in Hexagon fancybox. TODO: Refactor out fancybox options hash.
2010-10-18 11:24:47 -07:00
