Sarah Mei
2255e80b69
So. It turns out that postgresql has a less-consistent idea of what .first means in an association with no default ordering. All the places we were doing bob.aspects.first (& etc.) needed to be more specific. & o ya, POSTGRES IS GREEN.
2011-08-29 22:03:05 -07:00
Sarah Mei
b60101b9ad
Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new.
...
Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.
2011-08-28 16:08:57 -07:00
Dan Hansen
27d4fd8176
fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files
...
require confirmation for comments in js, get rid of rails helper
2011-08-26 15:24:07 -05:00
Dan Hansen
d75ef8d020
made backtotop a widget, added jquery-debounce
2011-08-26 12:30:28 -05:00
Dan Hansen
4a64a172d1
Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
...
Conflicts:
spec/javascripts/stream-spec.js
2011-08-21 20:57:01 -05:00
Andrej Kacian
2a52face12
Add jasmine test for ajax spinner display
2011-08-22 00:38:34 +02:00
Dan Hansen
2e9040e227
merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less
2011-08-10 23:57:33 -07:00
Andrej Kacian
bddd7c717b
Write jasmine test for the tag unfollow icon visibility
2011-08-09 22:54:31 +02:00
Raphael Sofaer
f0f388d9e1
Fix weird error in jasmine suite
2011-08-05 15:09:16 -07:00
danielgrippi
99ac976594
fix redirects around getting_started and aspect/index
2011-08-03 18:07:43 -07:00
Raphael Sofaer
5967f01dab
Take out PostsFake, now that we ajax in comments it's not worth the extra complications
2011-08-03 11:09:21 -07:00
Maxwell Salzberg
a325970e5d
test to make sure mobile site does not 500 with all media types
2011-07-28 13:16:43 -07:00
Raphael Sofaer
78bced56bb
Reshares and reshare retractions are green.
2011-07-22 16:00:19 -07:00
Maxwell Salzberg
fa9269541f
wip removed some generated specs
2011-07-21 18:22:17 -07:00
Raphael Sofaer
e59f49aace
Fix specs after merge
2011-07-11 14:38:51 -07:00
MrZYX
8c1c546bdf
fixed #884
2011-07-06 15:38:54 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8
a user can now follow and unfollow a tag
2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7
WIP you can now follow a tag, needs a clean up, and ajax love
2011-07-05 15:03:26 -07:00
Raphael Sofaer
3baf433b3a
More travis stuff
2011-07-02 00:50:11 -07:00
danielgrippi
8bf6ad45a5
various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine)
2011-07-01 22:04:36 -07:00
Raphael Sofaer
5884a900a2
Get rid of manage
2011-06-24 16:55:40 -07:00
Raphael Sofaer
df04b59857
Change :on to :post in the comment and post methods
2011-06-01 16:45:29 -07:00
Raphael Sofaer
537de1ce4c
build_like and build_comment now take only an options hash, and call build_relayable
2011-05-31 12:27:58 -07:00
Raphael Sofaer
cfd077a90d
Fix the thing that I broke in the build, fix syntax error in the build that disabled stream-spec
2011-05-28 20:37:12 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
danielgrippi
a02b9c01c8
eager loading aspect memberships
2011-05-13 18:22:42 -07:00
danielgrippi
a9a1280e17
one cuke failing. wip
2011-05-12 20:41:56 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
MrZYX
73c96ea8f0
Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec"
...
This reverts commit bd74ab4acc .
This reproducable breaks functionallity (comments). Please do not push WIP/not working stuff to master. To continue work just revert this revert. Thanks
2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc
Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec
2011-05-10 23:19:36 -05:00
Dan Hansen
50e67524c1
content update wip
2011-05-08 15:18:02 -05:00
Raphael Sofaer
8edb6ad649
Take double memoization out of aspects controller spec
2011-05-07 16:29:50 -04:00
Raphael Sofaer
a67b32d047
Add tag to rspec specs that generate jasmine fixtures
2011-05-07 13:54:55 -04:00
Arzumy MD
3767cce149
moved render_views out of controller specs to spec_helper.
...
cleaned up indentation and spacing in controller specs.
2011-05-07 18:38:40 +08:00
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
Raphael Sofaer
bbf1bf00cb
Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would.
2011-04-06 12:11:49 -07:00
danielgrippi
68375fdb02
added mutual flag, removed pending from contact, specs are green. wip
2011-04-05 16:12:53 -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
zhitomirskiyi
5a9ec82597
can now hide posts
2011-03-30 16:43:28 -07:00
zhitomirskiyi
70d1c31733
fixed the issue of nothing showing up for empty aspects
2011-03-30 11:29:12 -07:00
zhitomirskiyi
4a7326e035
WIP
2011-03-30 11:29:12 -07:00
Sarah Mei
ae106e71ae
Move sort order to a before filter, because this index method is waaaaay too big.
2011-03-27 18:52:43 -07:00
Sarah Mei
c4bc24d485
Add spec for remembering sort order
2011-03-27 10:56:08 -07:00
Sarah Mei
56b0d7821d
Move a few specs out of an expensive context they don't need
2011-03-27 10:47:04 -07:00
MrZYX
55417cf9e3
AspectsController#move_contact -> AspectMembershipsController#update
2011-03-27 13:29:36 +02:00
MrZYX
b689d4695b
refactor of routes.rb done so far; further refactor needs design decisions
2011-03-27 00:05:35 +01:00
danielgrippi
43315e14f9
sort contacts by name, not by a potentially nil field
2011-03-23 10:16:55 -07:00
zhitomirskiyi
e45a3503d0
on aspect edit the contacts are now sorted by first name
2011-03-22 18:01:17 -07:00
Raphael Sofaer
42a361dcce
Don't redirect ajax requests to getting_started. Fix a possible source of errors and backfill a couple tests
2011-03-18 21:07:31 -07:00