Maxwell Salzberg
0a75e59c19
remove installing wrong bundler manually
2012-03-09 18:36:14 -08:00
Maxwell Salzberg
5a34ef8592
update travis.yml for bundler 1.1
2012-03-09 18:33:47 -08:00
Maxwell Salzberg
ed62910286
this is dumb, but use RC bundler so travis does not barf
2012-03-09 18:19:16 -08:00
Maxwell Salzberg
332aede418
roll back heroku san
2012-03-09 18:03:40 -08:00
Maxwell Salzberg
000f8d3b08
Revert "adding custom landing page for heroku"
...
This reverts commit 061badf74e
2012-03-09 17:44:45 -08:00
Maxwell Salzberg
123841147b
update some gems, including bundler :)
2012-03-09 17:43:09 -08:00
Maxwell Salzberg
061badf74e
adding custom landing page for heroku
2012-03-09 17:20:22 -08:00
Maxwell Salzberg
51c47695b2
Merge pull request #2978 from Raven24/video-thumbnail
...
oembed video thumb [oh yeah]
2012-03-09 16:56:42 -08:00
Maxwell Salzberg
0d5c518630
Merge pull request #2976 from jbivins/legacy-browser-support
...
Legacy browser support
2012-03-09 16:51:34 -08:00
Florian Staudacher
7505670a2a
removed unnecessary js/css, since it works differently now
2012-03-09 18:16:21 +01:00
Jonne Haß
675c441e67
Merge pull request #2985 from diasp/more-localization
...
Added localized text in comment view
2012-03-08 06:02:40 -08:00
Diaspora Europe
07cc4f06f4
added localized text in comment view
2012-03-08 14:37:39 +01:00
Maxwell Salzberg
06f9e780e5
Merge pull request #2983 from diasp/improve-mobile-views
...
Improve mobile sign up and sign in view [ci skip]
2012-03-07 23:25:14 -08:00
Maxwell Salzberg
9f220ffd9c
Merge pull request #2984 from diasp/localized-text
...
Added localized text in getting started view [ci skip]
2012-03-07 23:24:49 -08:00
Diaspora Europe
f26563c90c
added localized text in getting started view
2012-03-08 08:21:22 +01:00
Steven Fuchs
d84b0c58bd
simplify search results processing since only one person can be returned
2012-03-07 23:19:51 -05:00
Steven Fuchs
9de477cf5a
jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches.
2012-03-07 23:19:51 -05:00
Steven Fuchs
ee237c6c5f
jasmine spec for stimulating deferred searches
2012-03-07 23:19:51 -05:00
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
