Commit graph

8776 commits

Author SHA1 Message Date
Maxwell Salzberg
e6d1617268 added timeago to notifications page. @ohaibbq, this is getting annoying :P 2011-09-01 10:52: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
Daniel Grippi
9cff210b24 Merge pull request #1691 from manuels/issue1596-Make-hashes-of-hashtags-in-text-shinier
[PaperCut] add underlining for hovered tags
2011-09-01 10:05:54 -07:00
Daniel Grippi
00ffc996e4 Merge pull request #1866 from TheLambdaCalculus/b1126-deletion-of-all-photos-from-a-post-with-no-words-should-result-in-the-post-being-deleted
B1126 deletion of all photos from a post with no words should result in the post being deleted
2011-09-01 10:04:10 -07:00
Maxwell Salzberg
5685b8964a Merge pull request #1867 from vcuculo/1863-fix-mobile-comments
Fix for mobile comments
2011-09-01 08:58:16 -07:00
vcuculo
8270a486ae dont forget mobile site :) 2011-09-01 09:48:57 +02:00
The Lambda Calculus
9d7b8d7f5d Have passing Cucumber tests [Finishes issue #1126] 2011-09-01 01:59:51 -04:00
The Lambda Calculus
98b71f92ab We now do a check on photo deletion to ensure that any associated status messages are also deleted if now empty [Issue #1126] 2011-09-01 01:59:51 -04:00
The Lambda Calculus
636f05bd32 [Issue 1126] Starting to build cucumber test for issue 2011-09-01 01:59:51 -04:00
maxwell
f5fbaaadcf added timeago and stream to the tag page 2011-08-31 21:54:14 -07:00
Sarah Mei
2e747e814f Turns out we need that absolute option after all. 2011-08-31 21:21:55 -07:00
Sarah Mei
1e50137815 Fix person_href 2011-08-31 20:29: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
Dan Hansen
818af38bdf autoresize inputs 2011-08-31 17:13:24 -05:00
danielgrippi
7e72a29401 fixed aspect edit pane (removed diaspora ids) 2011-08-31 14:55:23 -07:00
MrZYX
6ef8edc9c1 updated locales 2011-08-31 20:34:45 +02:00
Maxwell Salzberg
197dcc1a61 Merge pull request #1856 from vcuculo/fix-search-user
Previous fix for avatars doesnt work on FF
2011-08-31 09:29:52 -07:00
Maxwell Salzberg
0e646d7bf7 Merge pull request #1858 from vcuculo/1847-fix-mobile-site
1857 Fix for mobile site
2011-08-31 09:24:48 -07:00
vcuculo
5b0ce6b2a9 fix for mobile site 2011-08-31 14:11:51 +02:00
vcuculo
3832f24a02 previous fix for avatars doesnt work on FF 2011-08-31 09:25:39 +02:00
Maxwell Salzberg
27864660f9 add feature for mentions 2011-08-30 23:18:08 -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
31239df8b9 Merge branch 'master' of github.com:diaspora/diaspora 2011-08-30 21:05:00 -07:00
Sarah Mei
b6e2e9452f Fix YouTube titles on 1.9. (SIGH.) 2011-08-30 21:04:29 -07:00
Dan Hansen
3bed2ac834 only pass in the post's likes container to the likes widget, comments have likes widgets 2011-08-30 22:53:47 -05:00
Daniel Grippi
50e7d2a254 Merge pull request #1852 from vcuculo/fix-search-user
fixed user search + avatar
2011-08-30 20:44:55 -07:00
Dan Hansen
624e7277e8 the "When I open the comment box" step used an old javascript function of ours that no longer exists. remove the feature and replace it with "When I focus the comment field" 2011-08-30 22:08:54 -05: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
f788de17fd allow the user to see who has liked a specific comment. 2011-08-30 21:13:12 -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
d2f1f2fba9 Merge branch '1844-mentions-in-markdown' of github.com:brianwisti/diaspora into 1844-mentions-in-markdown 2011-08-30 14:56:56 -07:00
Brian Wisti
8afa8a7617 Tentative commit for mentions in markdown 2011-08-30 14:55:18 -07:00
Brian Wisti
c33d20ce86 merge 2011-08-30 14:51:04 -07:00
Brian Wisti
a6e87ebcb2 placeholder commit, working on mentions in markdown merging. 2011-08-30 14:44:49 -07:00
vcuculo
640408b166 fixed user search + avatar 2011-08-30 22:38:39 +02:00
Brian Wisti
8aafc61071 merged with blank markdownify check 2011-08-30 12:55:52 -07:00
Maxwell Salzberg
51ace97323 fix youtube embedding. camelCase is such a bummer 2011-08-30 11:55:51 -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
Brian Wisti
9bb6be9773 Tags and mentions are done post-render by helper, if applicable. 2011-08-30 11:21:31 -07:00
danielgrippi
1ed839fb00 defualt foreman to run thin on port 3000 (unless otherwise specified). 2011-08-30 10:59:44 -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
Manuel Schölling
2b6167f99d Change cursor for lightbox thumbs 2011-08-30 15:18:10 +02:00