danielgrippi
|
106ae983d5
|
Merge branch 'master' into follow. all specs green.
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
|
2011-04-11 17:48:37 -07:00 |
|
danielgrippi
|
352d1c6abf
|
fixed disconnecting logic. specs&cucumber green
|
2011-04-11 15:10:51 -07:00 |
|
Raphael Sofaer
|
080f08187d
|
Disable typhoeus everywhere but the HTTPMulti specs
|
2011-04-11 14:52:21 -07:00 |
|
danielgrippi
|
aeda5a4e39
|
dispatching / receiving logic complete. following wip.
|
2011-04-07 18:29:24 -07:00 |
|
maxwell
|
51b3cd9c77
|
attempt to fix the problem where people who wanted emails were no longer getting them
|
2011-04-07 14:05:40 -07:00 |
|
danielgrippi
|
4f972a23f6
|
drop requests table wip
|
2011-04-06 19:01:41 -07:00 |
|
danielgrippi
|
2e5b5e1efe
|
request notification emails -> started sharing notification emails
|
2011-04-06 13:21:15 -07:00 |
|
Raphael Sofaer
|
a172e56290
|
Make the ordering in querying spec less brittle
|
2011-04-06 12:33:20 -07:00 |
|
Raphael Sofaer
|
3fb822c6c5
|
Fix distinct problem
|
2011-04-06 12:29:05 -07:00 |
|
danielgrippi
|
847f4fd260
|
edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip.
|
2011-04-05 18:53:10 -07:00 |
|
danielgrippi
|
68375fdb02
|
added mutual flag, removed pending from contact, specs are green. wip
|
2011-04-05 16:12:53 -07:00 |
|
Raphael Sofaer
|
fa41c1fc52
|
Stream query... FIXED?????
|
2011-04-05 14:56:56 -07:00 |
|
danielgrippi
|
07f7eff782
|
fixed all specs
|
2011-04-05 10:00:54 -07:00 |
|
Raphael Sofaer
|
fdb6675f28
|
Make things more postgres compatible
|
2011-04-05 09:49:39 -07:00 |
|
danielgrippi
|
cbdbe1b29b
|
follow wip. 2 failures.
|
2011-04-04 19:22:19 -07:00 |
|
danielgrippi
|
590e1fd93f
|
All green except invite connecting +2 misc.
|
2011-04-04 15:16:19 -07:00 |
|
Raphael Sofaer
|
79e3438b11
|
Fix CI?
|
2011-04-04 14:32:37 -07:00 |
|
Raphael Sofaer
|
b48b483eab
|
Still working on stream query
|
2011-04-04 13:06:15 -07:00 |
|
Raphael Sofaer
|
d09bf35213
|
Add tests for raw_visible_posts
|
2011-04-04 12:07:19 -07:00 |
|
danielgrippi
|
c800b0bfef
|
use fixtures in request spec; collapsed xml specs
|
2011-04-04 11:57:25 -07:00 |
|
MrZYX
|
9829f11498
|
fixed posting spec
|
2011-04-02 14:01:16 +02:00 |
|
zhitomirskiyi
|
5a9ec82597
|
can now hide posts
|
2011-03-30 16:43:28 -07:00 |
|
maxwell
|
6364f2a332
|
clean activity streams, fix test
|
2011-03-30 14:27:20 -07:00 |
|
danielgrippi
|
d3c0f1b3d2
|
ruby objects, get outta my face. (conversationscontroller new)
|
2011-03-30 12:45:47 -07:00 |
|
maxwell
|
eff42b4219
|
make publish spec reflect the working job
|
2011-03-30 11:34:54 -07:00 |
|
danielgrippi
|
9a0d6219b5
|
Moving PostVisibility to aspects, WIP, model specs pass
|
2011-03-29 17:31:56 -07:00 |
|
maxwell
|
ccaa9465ec
|
remove puts
|
2011-03-29 11:06:44 -07:00 |
|
maxwell
|
5392b5c6ef
|
strip more than 5 tags when updating profile so people with broken profiles can update again
|
2011-03-29 10:56:11 -07:00 |
|
Raphael Sofaer
|
aed190dc6d
|
cucumber for comment retractions, modified views
|
2011-03-25 16:26:03 -07:00 |
|
Raphael Sofaer
|
b9af450628
|
Relayable retractions pretty much done
|
2011-03-25 16:09:37 -07:00 |
|
Raphael Sofaer
|
31f43696cb
|
Initial work on retracting comments
|
2011-03-25 16:09:37 -07:00 |
|
zhitomirskiyi
|
7a31531258
|
added location to the profile
|
2011-03-23 15:56:46 -07:00 |
|
zhitomirskiyi
|
9abe22d5d2
|
added a dependant destroy to the service_users
|
2011-03-23 11:56:15 -07:00 |
|
Sarah Mei
|
631163ec02
|
"Add contact" buttons on tag page are smaller and don't appear on top of names.
Moved some logic from view into user model.
|
2011-03-22 13:16:58 -07:00 |
|
Raphael Sofaer
|
fdd158d86a
|
Make urls not change on processing
|
2011-03-21 18:42:36 -07:00 |
|
Raphael Sofaer
|
2b997e70c2
|
Refactor image processing to use 2 uploaders. Federation and s3 need testing
|
2011-03-21 16:40:53 -07:00 |
|
zhitomirskiyi
|
c929ce21ad
|
fixed validation on tag length in profile
|
2011-03-21 16:01:34 -07:00 |
|
zhitomirskiyi
|
32f08ef345
|
fixed the nil photo_url and the all being called twice in the specs
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
aa5bef0c3f
|
calls the job on login does a sync call if the cache friends was not called before, fixed the views
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
dcc80d5b43
|
almost done, need to figure out how whats the deal with the controller not being called
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
70d71ec491
|
service users is green
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
ede7d4e8e2
|
made the job, broke outthe save_users, still need to do lifecycle callbacks
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
3afa14d341
|
wip
|
2011-03-21 14:56:50 -07:00 |
|
MrZYX
|
1b1a23aa8f
|
likes/dislikes WIP TODO: better icons, better styling, integration on photo show page
|
2011-03-20 18:10:58 +01:00 |
|
Sarah Mei
|
69c0d8e1d9
|
A bit of refactoring on the invitation spec. Remove old pending specs.
|
2011-03-19 23:10:20 -07:00 |
|
Sarah Mei
|
10019bb3db
|
Fix User spec. Also, people_in_aspects now won't let you get people for aspects you don't own. people_in_aspects should probably be arel and/or an association extension.
|
2011-03-19 13:25:27 -07:00 |
|
maxwell
|
8f9f24f383
|
fix for photo urls before they are processed
|
2011-03-18 19:00:24 -07:00 |
|
Raphael Sofaer
|
e2f78a8b8c
|
Protect against pre-existing post_visibilities, log them so we can find out where they are coming from.'
|
2011-03-18 14:52:27 -07:00 |
|
maxwell
|
924dc13adc
|
profile tagging now federates #FO #REAL
|
2011-03-17 18:05:49 -07:00 |
|
maxwell
|
562c0d40ac
|
profile tags now federate
|
2011-03-17 16:28:17 -07:00 |
|