maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05:17 -07:00
danielvincent
51dd6d32b3
upload a photo button next to publisher
2010-10-29 10:38:53 -07:00
danielvincent
4776f4810e
fixed failing spec for photos_controller#edit
2010-10-29 10:38:53 -07:00
danielvincent
1d399598d3
user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show
2010-10-29 10:38:17 -07:00
danielvincent
a7df1bca68
photos do not require an album. uploading files on a user's photos#index page will post to all aspects.
2010-10-29 10:38:17 -07:00
danielvincent
2b4e3e3a41
a person now has a photos#index page.
2010-10-29 10:38:17 -07:00
zhitomirskiyi
aaff5083f0
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 10:35:20 -07:00
zhitomirskiyi
dfb2408447
couple of readme changes
2010-10-29 10:34:37 -07:00
Alec Leamas
5b6743d677
Bugfixes, non-interactive run possible
...
Closes remarks in tickets 436 and 437. Still has a nasty bug 440.
A little hesitant to remove the editor invocation for setting
up config file. This is still possible while using parameters for
non-interactive runs. But I was lazy, took the existing code, which
is a little simpler although much less powerful for user.
2010-10-29 15:55:15 +02:00
Alec Leamas
94327264d4
Comments on Swedish diaspora terms, trailing blanks killed
2010-10-29 11:11:56 +02:00
Sarah Mei
14fedf5369
GAHHH STOP EMAILING ME (specs pass)
...
Also, added attr_protected to Photo#person and Photo#person_id.
2010-10-29 00:59:26 -07:00
Raphael
f1ae95fac9
443- patch trim on validation + spec
2010-10-28 20:03:49 -07:00
Raphael
fd2fac865b
Without typos
2010-10-28 18:07:17 -07:00
Raphael
83f8cbbb5c
Try fixing db:seed:backer
2010-10-28 18:02:06 -07:00
zhitomirskiyi
3fc5651e9d
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-28 17:03:14 -07:00
zhitomirskiyi
f5d54ff6f8
another silly malicious friend spec
2010-10-28 17:02:55 -07:00
Raphael
78acdb7368
Pushing broken photo controller spec for dan to fix
2010-10-28 16:19:18 -07:00
Raphael
b5bea7f14d
Add specs for photo mass assignment
2010-10-28 16:19:18 -07:00
Alec Leamas
bc59941ff7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 00:58:08 +02:00
Hexagon
09fb02ec9f
modified: config/locales/diaspora/sv.yml
2010-10-29 00:55:27 +02:00
Raphael
512f40eac2
attr_accessible on Post
2010-10-28 15:50:19 -07:00
Raphael
f7d2665950
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-28 14:29:40 -07:00
Raphael
4aaa921121
A couple specs for create overwriting users
2010-10-28 14:26:20 -07:00
danielvincent
0dcffc6227
made 404 page message clearer.
2010-10-28 14:07:52 -07:00
zhitomirskiyi
55b38585d6
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-28 12:13:50 -07:00
zhitomirskiyi
f484eb957f
comments now don't imbed the person in the xml
2010-10-28 12:13:39 -07:00
danielvincent
d02c36b53a
quickfix in add_friend_dropdown
2010-10-28 11:30:45 -07:00
danielvincent
a0d83e28a1
copy in manage page by clicking 'add a new friend' for now
2010-10-28 11:28:58 -07:00
danielvincent
6626b00961
fix on aspect#show in @friends_not_in_aspect
2010-10-28 11:11:05 -07:00
danielvincent
bb9a6e47a4
added birthday and gender to Profile. fixed a view issue on getting_started#2
2010-10-28 11:01:16 -07: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
