Sarah Mei
|
bcb4fac465
|
Vanna doesn't include helpers so we have to include them in views separately to use them. The absence of this line was producing a deprecation warning for error_messages_for, because our helper redefines that method (it was removed from rails).
|
2011-07-14 18:24:33 -07:00 |
|
danielgrippi
|
3e7e2b4d2a
|
DH remove test pollution from EventBroker#subscribe spec
|
2011-07-14 18:03:30 -07:00 |
|
Sarah Mei
|
7bfd695483
|
Patch Capybara to get rid of cucumber deprecation warnings
|
2011-07-14 17:55:03 -07:00 |
|
Sarah Mei
|
395bb5679b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-07-14 17:31:42 -07:00 |
|
Sarah Mei
|
a096f3d9fc
|
Make infinite scroll feature work on any size screen.
|
2011-07-14 17:31:31 -07:00 |
|
Dan Hansen
|
10026dd100
|
indentation fixes for public/javascripts/widgets
|
2011-07-14 13:35:45 -07:00 |
|
MrZYX
|
d88e86681d
|
updated locales
|
2011-07-14 20:29:55 +02:00 |
|
Daniel Grippi
|
2947a89519
|
put ?invite in the readme.
|
2011-07-14 11:15:46 -07:00 |
|
Daniel Grippi
|
ed56a4f8de
|
remove stray punctuation from readme.
|
2011-07-14 10:28:16 -07:00 |
|
Dan Hansen
|
bdb4c888a9
|
Remove embedder spec from git repo, it's now in spec/javascripts/widgets/embedder-spec.js
|
2011-07-13 22:49:32 -07:00 |
|
Dan Hansen
|
ca2413ff6b
|
Widgets now subscribe to a widget/ready event. Apply change to all widgets, added some tests & lots of cleanup.
|
2011-07-13 22:23:31 -07:00 |
|
Raphael Sofaer
|
abe10b3889
|
Comment out falsely failing JS tests, we should just stop using extend, it is needlessly hard to test.
|
2011-07-13 11:03:55 -07:00 |
|
Raphael Sofaer
|
55009a8381
|
Use activerecord-import to re-save ServiceUser objects. We should do the same in ReceiveLocalBatch.
|
2011-07-13 10:59:41 -07:00 |
|
danielgrippi
|
f4bdf17c4a
|
expand hoverhard a few pixels to suit the longest aspect names
|
2011-07-13 10:21:34 -07:00 |
|
Arzumy MD
|
03e79da171
|
fixed missing i18n key for no_services
|
2011-07-13 12:17:47 +08:00 |
|
Maxwell Salzberg
|
07ca376854
|
fix failing cuke
|
2011-07-12 20:19:39 -07:00 |
|
Maxwell Salzberg
|
6523f0542a
|
require haml in chubbies to kill error
|
2011-07-12 20:19:38 -07:00 |
|
Raphael Sofaer
|
0fae31dacf
|
Prevent people pagination links on tag pages from breaking lines
|
2011-07-12 17:21:02 -07:00 |
|
Raphael Sofaer
|
df5177a50d
|
Fix mobile AS photo page
|
2011-07-12 17:05:37 -07:00 |
|
Raphael Sofaer
|
874654b461
|
Reenable sessionscontroller after_filter
|
2011-07-12 17:01:40 -07:00 |
|
Raphael Sofaer
|
c3ecc59bee
|
Bring back the js people pagination on tag show, we need a js file for that page
|
2011-07-12 16:45:29 -07:00 |
|
Raphael Sofaer
|
14759b2c80
|
Use person_link in notifications_helper, move hovercard css out to a file
|
2011-07-12 16:21:03 -07:00 |
|
danielgrippi
|
6f807f263a
|
fix the specs; pull back guid in post_visibilities_controller
|
2011-07-12 15:18:28 -07:00 |
|
Raphael Sofaer
|
c622c08d49
|
Clarify already invited
|
2011-07-12 15:13:45 -07:00 |
|
Raphael Sofaer
|
e30b82dd45
|
Fix resend links in inviter
|
2011-07-12 15:08:03 -07:00 |
|
MrZYX
|
98ebb384ca
|
update i18n-inflector-rails
|
2011-07-12 20:37:13 +02:00 |
|
MrZYX
|
9304db68f1
|
fix peoples#aspect_membership_dropdown
|
2011-07-12 20:04:55 +02:00 |
|
MrZYX
|
7e84747a52
|
clean up routes.rb a bit
|
2011-07-12 16:47:04 +02:00 |
|
MrZYX
|
5934616422
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2011-07-12 15:12:00 +02:00 |
|
MrZYX
|
8863bb2091
|
updated locales
|
2011-07-12 15:08:44 +02:00 |
|
MrZYX
|
2a15a17983
|
rails-i18n is now a gem
|
2011-07-12 15:04:48 +02:00 |
|
danielgrippi
|
dba8a6598c
|
don't constrain photos to squares on photo index
|
2011-07-12 00:21:44 -07:00 |
|
danielgrippi
|
039b65b5cc
|
a little js cleanup for post.js
|
2011-07-12 00:12:08 -07:00 |
|
danielgrippi
|
0fbf366ef1
|
prevent default on lightbox close button
|
2011-07-11 23:31:18 -07:00 |
|
danielgrippi
|
75115ccbb3
|
lower hovercard mouseout timeout to basically zero
|
2011-07-11 20:05:54 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
f6bf17897d
|
actually displaying the facebook results(first time connection), updating attributes instead of discarding the changes
|
2011-07-11 16:52:30 -07:00 |
|
Raphael Sofaer
|
58e844eb1f
|
fade in like action for comments
|
2011-07-11 16:53:14 -07:00 |
|
Raphael Sofaer
|
0e664b2caf
|
Fix likes on comments migration
|
2011-07-11 16:22:36 -07:00 |
|
Raphael Sofaer
|
be5f3bf95e
|
Merge branch 'like-comments'
|
2011-07-11 16:18:19 -07:00 |
|
Raphael Sofaer
|
8f50c622fa
|
Fix contentUpdater spec, adjust migration and fix a couple of the js viwes
|
2011-07-11 16:17:11 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
ee0ecc790c
|
making the service users badge wider, added a commented out seed step for having some service user data
|
2011-07-11 16:05:07 -07:00 |
|
Raphael Sofaer
|
a7d8535d36
|
Update migration to handle duplicate likes
|
2011-07-11 15:06:35 -07:00 |
|
danielgrippi
|
67882c775e
|
Addded Diaspora::Likeable module. Corrected the unique index for likes to include author_id; extracted before_save callback needed for tags into Diaspora::Taggable.
|
2011-07-11 15:06:35 -07:00 |
|
danielgrippi
|
d364f158b8
|
cache counters in for likes. pending Diaspora::Likeable module...
|
2011-07-11 15:05:55 -07:00 |
|
danielgrippi
|
e0bbde4ce2
|
comment likes wip. need to backfill some tests, make views nicer
|
2011-07-11 15:03:28 -07:00 |
|
danielgrippi
|
797a6f5ca9
|
like comments js response wip
|
2011-07-11 15:02:46 -07:00 |
|
danielgrippi
|
2e15b6a61e
|
Likes in comments, cache counter disabled for now.
|
2011-07-11 15:00:48 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
18a0a492fb
|
made the badges slightly wider on the facebook friend finder
|
2011-07-11 14:49:07 -07:00 |
|
Raphael Sofaer
|
e59f49aace
|
Fix specs after merge
|
2011-07-11 14:38:51 -07:00 |
|
Raphael Sofaer
|
eafe6a7c85
|
Merge branch 'ajaxy-comments'
|
2011-07-11 14:05:45 -07:00 |
|