Commit graph

2262 commits

Author SHA1 Message Date
Maxwell Salzberg
48cdf7c79f fix poetry mode, due to a mistake I made previously. also fixed a 500 where youtube titles do the unexpected 2011-09-01 12:03:07 -07:00
Maxwell Salzberg
7d96b603d3 fix bug where if youtube_maps or vimeo_maps were passed in as explicitly nil, the app would 500. #somethingididnotknow (Hash#fetch is kind of weird 2011-09-01 10:14:53 -07:00
Maxwell Salzberg
b8ca4bfcab added Link to profile page in webfinger profile to make federation a bit easier 2011-08-31 19:57:46 -07:00
Maxwell Salzberg
62aea0e820 fix for mention links, and the first tag links #ohYEAH 2011-08-31 18:06:30 -07:00
Maxwell Salzberg
272ab55482 Merge branch '1844-mentions-in-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1844-mentions-in-markdown 2011-08-30 22:15:52 -07:00
Dan Hansen
2b31999f28 pull in jasmine-ajax, start testing our ajax callbacks with meaningful responses 2011-08-31 00:00:49 -05:00
Sarah Mei
a5cbf59c6a Merge branch 'master' of github.com:diaspora/diaspora 2011-08-30 21:22:57 -07:00
Sarah Mei
f30e913743 Fix markdownify spec in 1.9. 2011-08-30 21:22:36 -07:00
Dan Hansen
cbc168fc27 only request comments once 2011-08-30 23:12:17 -05:00
Sarah Mei
b6e2e9452f Fix YouTube titles on 1.9. (SIGH.) 2011-08-30 21:04:29 -07:00
Dan Hansen
7e20cece42 remove stray console.logs, set $.fx.off to true to make the failing likes spec pass in firefox 2011-08-30 21:44:43 -05:00
Dan Hansen
dc947e449b fix issues with comment stream, fix likes, merge comment stream and comment toggler widgets.
make timeago widget a simple wrapper for $.fn.timeago (we don't really need this.)
2011-08-30 21:07:40 -05:00
Brian Wisti
8aafc61071 merged with blank markdownify check 2011-08-30 12:55:52 -07:00
Maxwell Salzberg
bb8a9f0b3f small bug in markdownify to prevent barfing with a nil message 2011-08-30 11:34:54 -07:00
Maxwell Salzberg
e25decedc3 Merge pull request #1845 from fermionic/1811-mobile-share-button
1811 mobile share button
2011-08-30 11:27:36 -07:00
danielgrippi
4d1c93d95b Removed , but not the table. Record all in httpmulti success 2011-08-30 10:14:32 -07:00
danielgrippi
0dfcbca51b Revert "removed the pod_stats table (was the cause of bloat on the database)."
This reverts commit 902c40e42d.
2011-08-30 10:03:56 -07:00
danielgrippi
902c40e42d removed the pod_stats table (was the cause of bloat on the database). 2011-08-30 10:01:59 -07:00
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
Zach Prezkuta
3f5dd7e5b1 Issue #1811: Share button missing in mobile version 2011-08-29 22:30:14 -06:00
Maxwell Salzberg
224b59322b remove console.log in spec 2011-08-29 19:16:41 -07:00
Maxwell Salzberg
3bde507a3a DC MS fix crazy status.net linkback accept header 2011-08-29 18:44:31 -07:00
Andrej Kacian
36e32ba497 Update jasmine tests for the stream element widget. 2011-08-30 01:46:39 +02:00
danielgrippi
bd77560636 cucumber green in postgres (i think?). touched up aspect spec. 2011-08-29 15:53:47 -07:00
Maxwell Salzberg
f479a9a144 Merge branch 'brianwisti-1305-full-markdown' 2011-08-29 10:56:48 -07:00
danielgrippi
b7f9400a9f Moved post/comment text collapsing into respective widgets; removed from stream.js. Removed an unused function in stream.js (image hotlinking). 2011-08-28 22:04:06 -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
danielgrippi
802dd989a8 remove javascript in lieu of css; feature is still failing 2011-08-27 22:04:30 -07:00
Maxwell Salzberg
c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown
Conflicts:
	Gemfile.lock
2011-08-27 14:13:15 -07:00
Gonzalo Rodriguez
cc1add81b0 Avoid RecordNotFound exception thrown by find method when invalid person_id 2011-08-27 02:45:58 -03: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
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e45278a043 notification for reshares WIP 2011-08-25 17:16:09 -07:00
Gonzalo Rodríguez
31733e1f9f Merge pull request #1686 from grzuy/1486-invalid-birthday-crash
Fix #1486 profile update was crashing with invalid birthday date
2011-08-25 16:40:57 -07:00
Maxwell Salzberg
bcae8a1952 chubbies needs its own way of assigning a current user 2011-08-23 17:16:15 -07:00
Raphael Sofaer
a63d1ad4ae Sign out the signed in user if a different uid is passed to AuthorizationsController#new 2011-08-23 16:37:50 -07:00
Raphael Sofaer
6b88a75174 Log out a user if they arrive at AuthorizationsController#new carrying the username of a different user 2011-08-23 16:37:50 -07:00
Raphael Sofaer
c95f80be42 Re-nullify chubbies output and correctly handle diaspora_id param in create_account 2011-08-23 16:37:50 -07:00
Raphael Sofaer
76b0f31020 Fix the chubbies icon_url field, that needs to be icon path or be a url 2011-08-23 16:37:50 -07:00
danielgrippi
a7d9bbed84 wip 2011-08-23 16:37:50 -07:00
danielgrippi
27049e52b5 connect logic 2011-08-23 16:37:50 -07:00
Dan Hansen
6b040c7b4a clean up websocket receiver, add specs to content updater 2011-08-22 20:03:38 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7fd7fa968c fixed the email from header issues and backfilled few tests 2011-08-22 17:38:40 -07:00
Andrej Kacian
59ba3f85e6 Moved live() bindings for post hide icon from Stream.initialize to Stream.initializeLives 2011-08-22 20:18:02 +02:00
Andrej Kacian
9fd4432e5a Fix a jasmine test in CommentToggler 2011-08-22 20:05:18 +02: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
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Sarah Mei
163ac103cd Haven't figured out why reset password email body is blank, but I pulled it into a controller test so we can figure it out there instead of in a cucumber feature. 2011-08-21 16:45:53 -07:00
Andrej Kacian
395df041db Made toggleComments jasmine test aware that there are more posts in the fixture 2011-08-22 00:38:34 +02:00