maxwell
68a44af856
making a few more cleanup and tests
2010-10-29 11:13:08 -07:00
maxwell
eddcb71fcb
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:11:05 -07:00
maxwell
58f836ab46
adding pending spec to check for error within webfinger process
2010-10-29 11:06:31 -07:00
maxwell
0aae89aa03
adding case for error message being emmited
2010-10-29 11:06:31 -07:00
maxwell
53e9df5455
pumping up the zombie sleep to allow for mail to get send out .
2010-10-29 11:05:18 -07:00
maxwell
c645e2aff9
removing double fetch in dev utils controller
2010-10-29 11:05:18 -07:00
maxwell
9a2e3ef158
making a few more cleanup and tests
2010-10-29 11:05:17 -07:00
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
Sarah Allen
ef2c8fbfdc
Rails.env is a string, not a symbol
2010-10-28 21:28:20 -07:00
Justin Wienckowski
cdcb693c95
Issue #446 : Adding 32-character length limit to User#username, Profile#first_name, Profile#last_name
2010-10-28 21:12:36 -07:00
Curtis J Schofield
a1ccff0488
i put in a dash
2010-10-28 21:03:12 -07:00
Gabriel Gilder
bdb77ff282
redirecting to :back instead of manage page on failed aspect creation +spec
2010-10-28 21:01:53 -07:00
Derrick Camerino
5d0700001e
changing shell command to use FileUtils
2010-10-28 20:46:45 -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
livefromthemoon@gmail.com
52522c102e
add some basic verification when loading the languages config file
2010-10-28 18:09:25 +02:00
livefromthemoon@gmail.com
c4d8f4e587
remove two useless lines of code
2010-10-28 17:38:45 +02:00
livefromthemoon@gmail.com
b7a586b1a5
allow user to change his language in his settings
2010-10-28 17:29:17 +02:00
livefromthemoon@gmail.com
6e1121179d
guess locale from browser settings
2010-10-28 17:29:17 +02: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
