Gonzalo Rodriguez
|
d3a5bc1fb8
|
Merge branch 'master' into aspect_nav_rework
|
2011-10-01 03:58:50 -03:00 |
|
danielgrippi
|
eaa191515e
|
remove logging statement in a before filter that performed a query
|
2011-09-30 21:11:00 -07:00 |
|
Maxwell Salzberg
|
63c7634f6a
|
Revert "header data as helper methods"
This reverts commit 607013bc83.
|
2011-09-30 14:43:52 -07:00 |
|
danielgrippi
|
607013bc83
|
header data as helper methods
|
2011-09-30 13:22:12 -07:00 |
|
Maxwell Salzberg
|
fd42629c04
|
Merge pull request #2077 from christophe-de/username-blacklist
add username blacklist
|
2011-09-30 12:00:15 -07:00 |
|
Ilya Zhitomirskiy
|
27dcdf9a11
|
added an index to root_id
|
2011-09-30 11:35:07 -07:00 |
|
Maxwell Salzberg
|
621075d4e1
|
fix mentioning from profile page spec, add some tests for the ajax_stream? method
|
2011-09-30 10:54:13 -07:00 |
|
Paul Spieker
|
0c12471feb
|
add username blacklist
|
2011-09-30 14:17:04 +02:00 |
|
Maxwell Salzberg
|
dfb4c9c920
|
Merge pull request #2051 from uiri/672-facebook-majority-market-share
Links in the message translate into a proper link on Facebook when sendin
|
2011-09-29 18:13:33 -07:00 |
|
Maxwell Salzberg
|
6ac0a46120
|
green jasmine by stubbing ajax_stream? in aspects controller
|
2011-09-29 18:04:21 -07:00 |
|
Uiri
|
0fbda5d077
|
Modularized and Tested™
|
2011-09-29 21:04:18 -04:00 |
|
Maxwell Salzberg
|
45491f06d5
|
fix cuke for inf scroll(dont rely on session for sort order)
|
2011-09-29 17:33:15 -07:00 |
|
Maxwell Salzberg
|
cd2eb4292e
|
fix cuke for inf scroll(dont rely on session for sort order)
|
2011-09-29 17:23:53 -07:00 |
|
Maxwell Salzberg
|
aa5d5b560d
|
fix incorrect status_message#new view
|
2011-09-29 15:17:25 -07:00 |
|
Maxwell Salzberg
|
5c96705069
|
fix typo, update webdriver
|
2011-09-29 14:48:47 -07:00 |
|
Maxwell Salzberg
|
772f69de2d
|
fix typo in statusmessage controller
|
2011-09-29 14:06:36 -07:00 |
|
Maxwell Salzberg
|
44942036da
|
make the socketing tests pending as we are not currently doing that
|
2011-09-29 13:33:44 -07:00 |
|
Maxwell Salzberg
|
b27a8dd330
|
fix up info sidebar"
|
2011-09-29 12:51:00 -07:00 |
|
danielgrippi
|
70b175479c
|
format all on including stylesheet for WP7
|
2011-09-29 00:39:12 -07:00 |
|
danielgrippi
|
e3bf03636b
|
pass in mobile as provider_display_name on posts if posting from mobile
|
2011-09-28 22:15:32 -07:00 |
|
Ilya Zhitomirskiy
|
c3746aec7f
|
passing around arrays instead of object on local batch receive
|
2011-09-28 21:34:48 -07:00 |
|
Gonzalo Rodriguez
|
74d00d7db4
|
Merge branch 'master' into aspect_nav_rework
|
2011-09-28 19:52:15 -03:00 |
|
Maxwell Salzberg
|
5ae9edc72e
|
fix comment bug
|
2011-09-28 13:44:58 -07:00 |
|
danielgrippi
|
38624afd9c
|
fix reshare cubbies bug on mobile
|
2011-09-28 11:29:36 -07:00 |
|
danielgrippi
|
d2d205ee08
|
make autoexpand work
|
2011-09-28 11:21:14 -07:00 |
|
danielgrippi
|
42fcf3e394
|
reshares up top
|
2011-09-27 21:32:11 -07:00 |
|
danielgrippi
|
7d662fcc92
|
move share button to top right corner
|
2011-09-27 21:09:28 -07:00 |
|
danielgrippi
|
f34f0ce5fb
|
expand/collapse comments with animation; added collapse link on bottom
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
2b2443b6b9
|
aspect dropdown takes public and all aspects option
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
9b057bdf16
|
added placeholder; force autofill off on comment fields; touched up mobile reshare view
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
744ab579bd
|
adding comments work for one of two comment add buttons; added info on
posts; post show page.
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
3b08fc8406
|
wip
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
ea357a96ef
|
expand&collapse comments; added comment form (wip)
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
9d72247e9e
|
mobile tags page
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
d972802142
|
comment ajax on mobile.
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
91c9fffb81
|
touched up login page wip
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
f2f14c2894
|
fixed ajax for likes
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
6deb924c32
|
fixed header; compose message on top right
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
645af37358
|
more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
9e3ff7338e
|
ditch unused css rules; move js to body bottom
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
00e561dd01
|
comments -> reactions
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
ab3d220b57
|
always sort by created_at on mobile
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
8c586c4567
|
added html5 boilerplate meta tags to mobile; stripped functionality to add back
|
2011-09-27 21:09:25 -07:00 |
|
Uiri
|
3aa3b9aea8
|
Better regex solution
|
2011-09-26 23:59:33 -04:00 |
|
Uiri
|
82feff7fb4
|
Links in the message translate into a proper link on Facebook when sending to facebook.
|
2011-09-26 23:59:33 -04:00 |
|
danielgrippi
|
49bee9bf19
|
fix the build
|
2011-09-26 20:53:06 -07:00 |
|
Gonzalo Rodriguez
|
e0ffd7c63e
|
Merge branch 'master' into aspect_nav_rework
Conflicts:
features/posts_from_main_page.feature
public/javascripts/aspect-filters.js
spec/javascripts/aspect-filters-spec.js
|
2011-09-27 00:08:05 -03:00 |
|
Ilya Zhitomirskiy
|
d36da2a266
|
ms iz made the aspect stream ajax in
|
2011-09-26 19:34:35 -07:00 |
|
Ilya Zhitomirskiy
|
f9172c8733
|
added aspect dropdown to the getting started page, renamed the button to be add contact
|
2011-09-26 17:32:37 -07:00 |
|
Ilya Zhitomirskiy
|
675908a57d
|
added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services
|
2011-09-26 16:04:25 -07:00 |
|