Commit graph

4699 commits

Author SHA1 Message Date
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
Ilya Zhitomirskiy
afd1913de4 added a link to resque-web from admin page 2011-09-26 10:25:29 -07:00
danielgrippi
4bd1f0997d fix build 2011-09-25 13:14:09 -07:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
Maxwell Salzberg
049eb74ab2 added route to grab users profile picture if you know their username 2011-09-24 23:33:14 -07:00
Gonzalo Rodriguez
be00536810 Remove extra whitespace inside person_link that's causing bad formatting on likes list 2011-09-24 19:07:17 -03:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Ilya Zhitomirskiy
494ab8b13b added community welcome and a non-mandatory wording 2011-09-23 14:56:33 -07:00
Ilya Zhitomirskiy
f8c05851f6 added an email link to the right section 2011-09-21 14:40:59 -07:00
Ilya Zhitomirskiy
4fb62afa2d getting stated links open in new tabs, translated a string 2011-09-21 14:12:37 -07:00
Ilya Zhitomirskiy
386697f711 added a nil check, for pre-mongo days 2011-09-21 13:37:37 -07:00
Ilya Zhitomirskiy
c98f2d1664 added a weekly user stat for admin 2011-09-21 13:23:09 -07:00
Gonzalo Rodriguez
24be48d660 Strip full name considering cases where first or last name omitted 2011-09-20 22:18:35 -03:00
Maxwell Salzberg
8187fb9ddb clean up and move help widget up the page 2011-09-20 10:05:39 -07:00
Ilya Zhitomirskiy
2cebfa54cc fixed couple of specs, removed the federation fallback, and fixed the public hashtag pages (not displaying the publisher) 2011-09-19 15:52:25 -07:00
Ilya Zhitomirskiy
352be4d0c0 added the have support section and reworded the donation section to be clearer 2011-09-19 15:29:19 -07:00
Ilya Zhitomirskiy
41abb5790e changed the to proc syntax to explicit block syntax 2011-09-19 14:16:26 -07:00
Ilya Zhitomirskiy
ed4b91249d added a publisher to the tag page 2011-09-19 11:38:55 -07:00
Maxwell Salzberg
bc1aef4999 MS IZ start to implement followed tags in the stream 2011-09-16 18:19:34 -07:00
Maxwell Salzberg
e865dfc269 fix a bug with emailing in posts going to tumblr 2011-09-16 13:57:38 -07:00
Maxwell Salzberg
55999bc443 resolve route conflicts 2011-09-16 12:49:47 -07:00
Maxwell Salzberg
6c414d8562 add tests for object_should_be_processed_as_public? and delegegated public to the parent of relayable objects 2011-09-16 11:24:13 -07:00
Maxwell Salzberg
b63b6cbcd5 remove job alias 2011-09-16 10:33:15 -07:00
Maxwell Salzberg
d1fc3caae0 remove salmon hack 2011-09-16 10:30:37 -07:00
Maxwell Salzberg
7ae003c88c alias receive salmon 2011-09-16 10:20:03 -07:00
Maxwell Salzberg
05816733ce alias job 2011-09-16 10:14:32 -07:00
Maxwell Salzberg
9e0446f707 conversations are not public 2011-09-16 09:53:32 -07:00
danielgrippi
36f5e45c25 change Base64.encode64 to Base64.encode64s (encode without newlines) 2011-09-16 08:53:13 -07:00
danielgrippi
58abbcc058 DG MS; activate dispatcher switch in Dispatcher; remove diasporahq blocker 2011-09-16 08:53:13 -07:00
danielgrippi
999efbd451 IZ DG MS; fix method call in public receiver 2011-09-15 19:37:56 -07:00
Gonzalo Rodriguez
2bb2c6e3e8 Add links to person profile for post hidden text 2011-09-15 23:16:13 -03:00
Loïc Guitaut
a739c4f308 Ability to mount resque jobs monitoring directly into Diaspora* routes
As resque-web is considered as a debug tool, route is disabled for
production by default, and can be enabled via the `mount_resque_web` key
in application.yml.
2011-09-16 02:40:57 +02:00
danielgrippi
60cb9e43a7 DG MS; renamed Salmon jobs; CGI::unescape() incoming xml in public receive route 2011-09-15 15:33:28 -07:00
danielgrippi
ba8e50e34c DG MS; renamed a file; fixed the build 2011-09-15 15:16:34 -07:00
danielgrippi
97f80272b2 DG MS; changed Job:: to Jobs::; require all mail jobs from Job base class 2011-09-15 12:42:53 -07:00
danielgrippi
ec011f0800 DG MS; optimized local comments to be batched; backfilled more tests 2011-09-15 11:22:47 -07:00
danielgrippi
cfa260927d DG MS; remove unusused job 2011-09-15 11:22:47 -07:00
Daniel Grippi
380b980f8b Merge pull request #1985 from alda519/featured_user_tag_link
fixed links to featured user's tags on getting_started page
2011-09-15 09:28:08 -07:00
danielgrippi
7216f76801 added some docs to Request [ci skip] 2011-09-15 08:39:21 -07:00
alda519
b2c141a221 fixed links to featured user's tags on getting_started page 2011-09-15 17:03:17 +02:00
danielgrippi
656640ee94 call Postzord::Receiver::Private explicitly in receive_salmon 2011-09-14 19:19:00 -07:00
danielgrippi
b3534ed5f4 Revert "show redis connection"
This reverts commit 6a887a6d99899b9876e3145fb0a8b92ce2a405cf.
2011-09-14 18:07:54 -07:00
danielgrippi
e0bdbef281 show redis connection 2011-09-14 18:07:53 -07:00
danielgrippi
4da9425480 fix pod_uri bug in app_config 2011-09-14 18:07:53 -07:00
danielgrippi
2f9ea6cd43 try accessing env var if present in app_config 2011-09-14 18:05:40 -07:00
danielgrippi
57079ef5cd set ENV['HEROKU'] explicitly in the heroku:config task 2011-09-14 18:05:40 -07:00
danielgrippi
f55a086752 edit app+_config to look for heroku's ENV['STACK'] config var; load settings from ENV hash instead of application.yml if on heroku 2011-09-14 18:05:40 -07:00
danielgrippi
fab6f9ccd9 DG MS; fixed tests; explicitly send in dispatcher in httpmulti 2011-09-14 17:51:25 -07:00
Maxwell Salzberg
60ace5c297 DG MS; Broke out HydraWrapper in HttpMulti job 2011-09-14 15:50:07 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
danielgrippi
aed08d6283 removed unused method; moved includes() out of scope 2011-09-14 00:10:04 -07:00
Ilya Zhitomirskiy
6b9ad7c4c6 SM IZ pared down markdownify to basic markdown, bumped version of RedCarpet 2011-09-13 20:20:49 -07:00
danielgrippi
015cc9e451 actually fix specs/cucumber 2011-09-13 18:21:16 -07:00
Maxwell Salzberg
df87b398c7 MS DG; fixed cucumber 2011-09-13 16:14:31 -07:00