Steven Fuchs
7d3a6a061c
add spec to ake sure background query is only set when a full diaspora id is given.
2012-03-07 23:19:51 -05:00
Steven Fuchs
ac8cd8368e
fixing conflicts in merge
2012-03-07 23:19:51 -05:00
Steven Fuchs
7048fa6d50
fixing conflicts in merge
2012-03-07 23:19:50 -05:00
Steven Fuchs
8344422aef
partial rename no longer needed
2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e
run second search ajaxily when no results are found from remote pod.
2012-03-07 23:19:50 -05:00
Dennis Collinson
9b08f3f69a
package assets always isn't refreshing, back to on
2012-03-07 18:42:41 -08:00
Maxwell Salzberg
b7fc774d06
semi-colons; use them
2012-03-07 16:24:02 -08:00
Maxwell Salzberg
ee2fafa31d
totally gross js load order problem.. make the widget system fire after the backbone app to get the notification and search autocomplete back
2012-03-07 15:20:21 -08:00
Maxwell Salzberg
db0859a83c
bug fix: you can now mention and post a photo at the same time
2012-03-07 14:42:46 -08:00
Diaspora Europe
92a857533e
improve mobile sign up and sign in view
2012-03-07 17:01:16 +01:00
Diaspora Europe
ecc86c1f86
handle many users in a message #2912
2012-03-07 13:00:55 +01:00
Maxwell Salzberg
76450f7882
Merge pull request #2906 from Raven24/fix-2770
...
fix for #2770
2012-03-06 22:36:53 -08:00
Maxwell Salzberg
d211272cab
Merge pull request #2981 from DeadSuperHero/beautyqueen
...
Fix #2974 , markdown headers now different from headers in post [ci skip]
2012-03-06 22:35:04 -08:00
Florian Staudacher
2976f7d7d1
added overlayed "play" icon to thumb,
...
made the "loader" gif background for oembed container
make videos autoplay after click
2012-03-07 00:52:26 +01:00
danielgrippi
bdcbf5b985
responsive show pages [ci skip]
2012-03-06 15:19:05 -08:00
Sean Tilley
053ca1d20b
Fix #2974 , markdown headers now different from headers in post
2012-03-06 17:10:04 -06:00
Maxwell Salzberg
aa35519bf0
Merge pull request #2939 from gandaro/2938-consistent-superscripts
...
disable superscripts on server-side markdownify, since they are disabled...[ci skip]
2012-03-06 12:30:41 -08:00
Maxwell Salzberg
f81a6ced01
Merge pull request #2886 from diasp/2823-fix-unlike-unfollow
...
#2823 fix unlike and unfollow update
2012-03-06 12:22:20 -08:00
Maxwell Salzberg
2a498d4d85
Merge pull request #2980 from s-f-s/white_spaces_fix_in_integration_rake_task
...
Fix to allow white spaces in Rails.root path for the integration rake task [ci skip]
2012-03-06 12:16:36 -08:00
Stephan Schulz
4d1cb56e47
Allow for white spaces in Rails.root path for the integration rake task
2012-03-06 15:45:45 +01:00
Maxwell Salzberg
5a7c8d8ea4
make the hash in oembed cache dynamic as to try to fix travis
2012-03-05 11:09:51 -08:00
Florian Staudacher
98d1e29055
extracted oembed thumb stuff from #2941 , also fixes oembed cukes
2012-03-05 00:44:08 +01:00
Joe Bivins
7b47edff14
Move date parsing to a helper.
2012-03-04 13:36:35 -05:00
Maxwell Salzberg
9e249bb7ef
small refactor of helper method [ci skip]
2012-03-03 17:53:50 -08:00
Maxwell Salzberg
e6b1111fd1
AHHHH refactor attack_vectors_spec; hopefully it now borders on understandiablity. this deffy needs another pass from another human, as I had to make tons of spec helper methods to make the crazy setup make sense, but I think we are bordering on something that would let us write new tests in a sane way. whether all of these tests now make sense to test in the first place, that is another question all togther, as it was outside the scope of this refactor
2012-03-03 17:50:51 -08:00
Maxwell Salzberg
bd021bbd91
Correct our general exception handling.
...
thanks @mperham! see: http://t.co/Jyt7vV4I
2012-03-03 16:26:06 -08:00
Maxwell Salzberg
67e4f9e159
remove puts and fix a conversationscontroller spec to be a bit more predictable
2012-03-03 16:25:10 -08:00
Joe Bivins
8df0bb85fe
Wrap the publisher params tag in a div instead of a paragraph.
...
Safari 4.1.3 cited the closing params tag as being an unmatched tag.
Changing the paragraph to a div causes the error to disappear.
2012-03-03 12:42:54 -05:00
Joe Bivins
e26fcf836a
Correct JS error in app_spec.js
2012-03-03 12:20:31 -05:00
Joe Bivins
4769a25d59
Add ISO 8601 timestamp parsing for legacy browsers.
...
Would cause legacy browsers (e.g. Safari 4.1.3) to show posts in the
reverse order and the infinite scroll would not be triggered when
scrolling down to the end of the page.
2012-03-03 12:14:43 -05:00
Maxwell Salzberg
7036c82562
Merge pull request #2968 from dmorley/patch-12
...
remove shapado and getsatisfaction
2012-03-01 10:25:23 -08:00
David Morley
2b0dc3e1ec
remove shapado and getsatisfaction
2012-03-01 10:15:53 -08:00
Diaspora Europe
41c3698ebf
remove unused youtube_titles from comments and posts
2012-03-01 15:37:20 +01:00
Sean Tilley
fd540aacc9
Merge pull request #2964 from DeadSuperHero/photofix
...
Add extra bit to ensure fixedness for #2951
2012-03-01 02:04:12 -08:00
Sean Tilley
b4332b80e4
Add extra bit to ensure fixedness for #2951
2012-03-01 03:59:49 -06:00
Daniel Grippi
7a774661bb
Merge pull request #2777 from stwf/tweak-twitter-truncation
...
take url shortening into effect before truncating twitter posts
2012-02-29 22:49:46 -08:00
Daniel Grippi
ad9df616e0
Merge pull request #2963 from DeadSuperHero/photofix
...
Fix photo uploader, kill breakage #2951 [ci skip]
2012-02-29 22:46:28 -08:00
Sean Tilley
d505826bc5
Fix photo uploader, kill breakage #2951
2012-03-01 00:38:03 -06:00
Diaspora Europe
e2776420bc
added likes specs to post view
2012-02-29 12:12:32 +01:00
Maxwell Salzberg
0d93227f07
hopefully make travis happy:
2012-02-28 17:52:13 -08:00
danielgrippi
b6c4cab669
fix styling issue with popup comment box and last paragraphs [ci skip]
2012-02-28 15:27:31 -08:00
danielgrippi
cb9420bfd6
don't use symlinks; fix assets ordering issues.
2012-02-28 11:04:15 -08:00
danielgrippi
61b4e77bde
Merge branch 'profiles'
2012-02-28 10:29:17 -08:00
Dan Hansen
1a0c756bb3
Hovering over the upload file button uses the cursor pointer, Bug Mash Monday #5
2012-02-28 12:11:15 -06:00
danielgrippi
74cdc91bb1
fix likes and comment loading in the stream
2012-02-27 20:38:59 -08:00
Maxwell Salzberg
d80afc64ec
fix ordering for logged out users
2012-02-27 19:16:05 -08:00
danielgrippi
3d48dc4fb0
fix stream css
2012-02-27 19:08:37 -08:00
danielgrippi
1e518cbcff
fix media view
2012-02-27 18:50:33 -08:00
danielgrippi
81de530ce3
use better serif fonts
2012-02-27 18:41:28 -08:00
Maxwell Salzberg
879b3d135a
title now updates with switch
2012-02-27 18:40:56 -08:00
