movilla
795a7a5751
mobile error 500 if a reshared (original) post will be deleted.
2013-08-16 12:07:14 +02:00
Fábián Tamás László
43363c13e5
Code style fixes, removed unneeded rescue
2013-08-04 15:47:07 +02:00
Fábián Tamás László
6e4c1fe3c6
Improved opengraph data display
...
Style fixup
2013-08-04 15:44:56 +02:00
Fábián Tamás László
176c6826e0
opengraph POC
...
Fixed small-frame opengraph view
Fixed incompletely saved OpenGraphCache bug
2013-08-04 15:42:29 +02:00
Damien
f4b3f2fd1e
Consider Markdown header content as post title
...
clarify regexp and correct some bad backtracking
add specs
rewrite regex
convert mardown style title to plain text title
fix bad indentation
add jasmine test for post-viewer.js
tries to fix bad jasmine test
2013-07-31 14:59:02 +02:00
Fábián Tamás László
fb9b3e35c3
Put current user into gon
...
Fixed bug in app.js, removed unnecessray test
2013-07-06 12:44:08 +02:00
twain
e1ca8df15e
added strip_markdown to notification mails
2013-07-03 11:16:31 +02:00
Jonne Haß
30dff802d5
Merge pull request #4243 from davexunit/feature/2948
...
Show the user if a contact is sharing with them when viewing their profile page
2013-06-29 10:16:41 +02:00
David Thompson
2e83736f43
Add SASS for sharing message.
2013-06-20 07:39:56 -04:00
David Thompson
f7cceecb52
Add PeopleHelper#sharing_message method and english localized message text.
2013-06-19 22:03:37 -04:00
Jason Robinson
f30cee3b6e
Fix hashtags that start a line when posting to Facebook or Twitter, by applying all the same options to strip_markdown as applying to markdownify, fixes #3768 and #4154
2013-06-20 00:06:13 +03:00
Florian Staudacher
4ee5d5f19c
replace mentions of out-of-aspect people in limited posts with just a
...
markdown link to their profile (fixes #2516 )
add failing spec for #4160 / #2516
extend the spec a bit more
refactor mention handling in a status message
add method for filtering mentions by aspects
wire mention filtering into the status message model, adapt a few tests to
work properly
cosmetic changes
shorten helper methods
add changelog entry
2013-06-09 19:16:40 +02:00
Liane Nakamura
5f25a52676
Fix post iframe src url
...
Add test for posts helper
2013-05-26 20:49:56 +02:00
Jonne Haß
3b03a7cdde
strip trailing newlines from stripped markdown
2013-05-25 15:55:20 +02:00
movilla
bc87b501f2
Fix show more post in my activity mobile page. Close #4108
2013-04-08 00:04:42 +02:00
Dennis Schubert
f3b7d57b3a
Merge pull request #3993 from MrZYX/sidekiq
...
Sidekiq (+ some cleanup)
2013-04-03 15:19:15 -07:00
movilla
b257939f7e
Add multiphoto for mobile post
2013-03-30 10:59:06 +01:00
Jonne Haß
3fc3b249e7
End the require mess
...
* Rename and reorganize post fetcher to fix autoloading, also let it use
Faradays default connection so we get nice redirects
* Add initializer to load libs at a central place
* added lib dir to autoload_once paths to increase thread safety
* Moved lib/exceptions.rb to lib/diaspora/ to conform namespacing
2013-03-21 23:37:53 +01:00
movilla
3990bebcf4
Fix mobile view of deleted reshares
2013-03-18 16:52:37 +01:00
Juan Manuel Azambuja
1115e10536
Merge branch 'develop' into diaspora_with_sprites
...
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/application.css.sass
app/assets/templates/comment_tpl.jst.hbs
app/assets/templates/stream-element_tpl.jst.hbs
app/helpers/aspects_helper.rb
app/helpers/contacts_helper.rb
app/views/aspects/_aspect_listings.haml
app/views/aspects/toggle_contact_visibility.js.erb
app/views/contacts/_aspect_listings.haml
app/views/layouts/_header.html.haml
app/views/shared/_footer.html.haml
app/views/tags/_followed_tags_listings.haml
2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja
f429cacd7a
[Sprites] add sprites for icon images
2013-03-11 19:26:11 -03:00
Florian Staudacher
4cbae601e8
[WIP] aspect membership dropdown Backbone.js rework
...
* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships
TODO
* more tests
2013-02-17 13:40:10 +01:00
Ruxton
60f5173c77
Spec coverage for changelog_url and adjustment to behaviour
2013-02-04 11:00:57 +08:00
Ruxton
ff7308685a
Add a changelog_url helper so that pods can report a more correct changelog
2013-02-04 09:45:36 +08:00
Jonne Haß
b8128d356b
Merge branch 'hotfix/0.0.2.4' into develop
...
Conflicts:
Changelog.md
app/views/people/show.html.haml
config/defaults.yml
spec/helpers/layout_helper_spec.rb
2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28
Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948
...
From a quick look at the for us available databases this was not actually used in the wild.
2013-02-01 22:20:31 +01:00
Fabián Rodríguez
8b4aab0780
change #count to #size in notifications_helper to reduce queries
2013-01-29 10:01:09 -02:00
Fabián Rodríguez
d4d3bf8af6
fix translation in contacts_helper
2013-01-29 10:01:08 -02:00
Fabián Rodríguez
649844ea6a
Refactor contacts/index
2013-01-29 10:01:08 -02:00
Fabián Rodríguez
f978a75b8c
bootstrap my_aspects data
2013-01-16 19:33:20 -02:00
Diaspora Europe
ac3b2bc99f
pod version in footer and updated link to changelog #3705
2013-01-15 16:45:10 +01:00
Jonne Haß
bf698f3882
Do not strip "markdown" in links when posting to services, fix #3765
2012-11-26 14:16:43 +01:00
Bobby Wilson
abd4e17daf
Fix #3750
2012-11-22 13:00:47 -07:00
Jonne Haß
c59bb35087
Merge pull request #3754 from marpo60/housekeeping
...
Housekeeping2
2012-11-22 01:06:30 -08:00
Jonne Haß
5f6e03cfe5
Merge pull request #3714 from marpo60/refactor
...
Housekeeping
2012-11-22 01:06:05 -08:00
Fabián Rodríguez
232539cdf9
remove unused helpers
2012-11-21 18:26:17 -02:00
Jason Robinson
48a332f871
Remove by default markdown formatting from posts done via service, currently only used by Twitter. Remove markdown also from Facebook posts.
2012-11-09 00:04:49 +02:00
Fabián Rodríguez
48bb6ad25c
remove old experimental leftovers
2012-11-06 21:39:35 -02:00
Fabián Rodríguez
1d1b66f8cc
remove unused helper
2012-11-06 21:39:35 -02:00
movilla
928a8a02d8
Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false
2012-10-10 16:49:45 +02:00
Jonne Haß
234b76a936
properly integrate asset_sync
2012-09-26 20:23:45 +02:00
Jonne Haß
89c1fd5f7f
query the set url only through #pod_uri in the app
2012-09-26 20:19:37 +02:00
Jonne Haß
2a4db54db9
New configuration system
...
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
2012-09-26 20:19:37 +02:00
Jonne Haß
e70e48d6ca
some refactoring regarding the law of demeter
2012-09-23 19:33:19 +02:00
Jonne Haß
ab0ad630df
strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep
2012-09-12 05:48:12 +02:00
Florian Staudacher
645fa76b20
make the "last post" link show ownly if the person has any posts
...
(fixes #3437 )
2012-08-09 15:12:22 +02:00
Steven Hancock
a8de3a5a3f
Rails.root and File.join cleanup
...
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
2012-06-11 03:13:20 -07:00
Daniel Grippi
5b424e7d94
don't use quotes for chartbeat (it's picky) [ci skip]
2012-06-05 00:14:00 -07:00
Daniel Grippi
44f2b7ae44
Update master
2012-06-04 23:47:20 -07:00
Maxwell Salzberg
9cf946b20e
use a smaller thumb on the home stream
2012-06-04 15:19:05 -07:00
Maxwell Salzberg
64bf4a1f48
adding the ability to customize your open graph namespace
2012-06-01 17:31:34 -07:00
danielgrippi
ee27764816
missing quotes. ugh. [ci skip]
2012-05-30 16:50:31 -07:00
danielgrippi
9e42d4386f
actually add the guid into the layouts [ci skip]
2012-05-30 16:34:29 -07:00
danielgrippi
ca492b407c
add guid to mixpanel
2012-05-30 16:31:26 -07:00
danielgrippi
cf884fb1c9
finally fixed teh analytics helper [ci skip]
2012-05-30 14:56:02 -07:00
danielgrippi
7e544167f3
finally fixed analytics helper [ci skip]
2012-05-30 14:40:08 -07:00
danielgrippi
786a0be8b3
forgot one [ci skip]
2012-05-30 14:19:48 -07:00
danielgrippi
de8d7770fe
don't use double quotes in javascript tag helper for mixpanel [ci skip]
2012-05-30 14:11:45 -07:00
danielgrippi
72d2f619fc
added GA back into rack; added mixpanel configuration options
2012-05-30 13:30:28 -07:00
Maxwell Salzberg
82c4e0d577
add a podname app config var, and use it throughout the app
2012-05-30 12:11:59 -07:00
Maxwell Salzberg
de499ba276
new bookmarklet needs to be ridic wide to deal with bootstrap responsive :( [ci skip]
2012-05-23 18:06:50 -07:00
Maxwell Salzberg
bde23f8ab8
use image_tag for asset_pipeline goodness
2012-05-19 18:19:50 -07:00
Steven Hancock
125b013c10
AppsController no longer exists
...
Remove the AppsController check from the next_page_path helper, since
AppsController no longer exists.
fixes #3280
I'd like to write a helper spec for this, but it'll probably require
some stubbing/mocking and I'm a little too tired to deal with that at
the moment.. so for now let's just fix the problem. :)
2012-05-18 23:42:29 -07:00
Maxwell Salzberg
471ce309ea
kill your darlings; remove diaspora_client with fire
2012-05-17 14:55:53 -07:00
Maxwell Salzberg
fe6dcffa8f
remove cubbies from sidebar, also add invite code directly to sidebar to make even clearer
2012-05-14 16:33:56 -07:00
Maxwell Salzberg
eaedfc9827
create a new publisher using the new composer. only for beta users
2012-05-09 16:55:33 -07:00
danielgrippi
8111dfba31
star it! [ci skip]
2012-05-04 22:08:58 -07:00
danielgrippi
a5f34e67c7
made favicon sexier; extracted form-block into its own custom class; made the title of pages less caps-lock.
2012-05-04 21:25:50 -07:00
danielgrippi
5118985aeb
include default image for FB for timeline
2012-05-03 17:37:48 -07:00
danielgrippi
35b0f7637b
fix og tags for just text
2012-05-03 16:56:11 -07:00
danielgrippi
248ad9ad31
use the host, luke. (chartbeat wants a domain only. no protocol monkey-business) [ci skip]
2012-05-03 15:32:44 -07:00
danielgrippi
ba9bbd8777
don't use double quotes in your JS examples, chartbeat, thx. [ci skip]
2012-05-03 15:16:33 -07:00
danielgrippi
80f2638228
spelling is superb [ci skip]
2012-05-03 14:59:49 -07:00
danielgrippi
7be7acdfd6
add chartbeat option for great success (and metrics)
2012-05-03 14:04:19 -07:00
danielgrippi
ad593fea6c
single instead of double quotes [ci skip]
2012-05-03 00:40:54 -07:00
danielgrippi
bec7b96de7
add more og markup; send over large image re FB's request
2012-05-02 22:50:57 -07:00
danielgrippi
fe49579ff5
remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked)
...
i've submitted an issue to the gem. hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
2012-05-01 18:02:25 -07:00
danielgrippi
d2c996006f
forgot to add _setCustomVar param to _gaq. doh. [ci skip]
2012-04-29 11:57:52 -07:00
danielgrippi
c06e8b3329
track anonomous user segments via analytics (let's see how successful the beta channel features are)
2012-04-29 11:37:05 -07:00
Maxwell Salzberg
7ebf5380c6
addressable has a helper method for this
2012-04-28 17:58:46 -07:00
danielgrippi
bbd4ee5738
correctly redirect for beta and admin users (profile vs stream homepages)
2012-04-28 15:09:02 -07:00
danielgrippi
6d9dd1f4d3
skeleton in place.
2012-04-21 13:12:56 -07:00
Maxwell Salzberg
bfbae50e5a
update a few things for the asset pipeline, and fix a couple of other mobile bugs
2012-04-19 21:52:44 -07:00
Maxwell Salzberg
397b89c21a
small improvements to open graph stuff [ci skip]
2012-04-19 21:03:06 -07:00
Maxwell Salzberg
cdef049529
include a default image in the og:image [ci skip]
2012-04-19 20:33:11 -07:00
Maxwell Salzberg
a008aaeba8
make the embed tags have a bit more length
2012-04-19 20:20:40 -07:00
Maxwell Salzberg
307ee15884
hella open graph tags
...
added some basic open graph tags to the posts#show page.
2012-04-19 17:40:13 -07:00
Maxwell Salzberg
ab48ca260b
kinda ugly hack for ports in url with iframes
2012-04-18 16:12:57 -07:00
Maxwell Salzberg
c9e3852de8
oembed mostly works
2012-04-18 16:12:56 -07:00
Maxwell Salzberg
31172a9959
basic oembed provider set up... too tried to finish this now
2012-04-18 16:12:56 -07:00
Maxwell Salzberg
90a2f05515
include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770
2012-04-17 22:28:01 -07:00
Steven Hancock
021cc99492
bootstrap-sass
...
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.
I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.
I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
2012-04-11 06:16:01 -07:00
Florian Staudacher
024f1fee74
disable jQuery effects for tests
...
... might buy us a few seconds
2012-04-05 16:12:45 +02:00
Steven Hancock
a8843c1036
Fix JSON caching regression
...
Disable jQuery's AJAX caching to prevent the browser's
back button from dumping the stream in JSON format.
Includes a test for the jquery_include_tag helper to
ensure that the necessary line of javascript doesn't
go missing again.
closes #3094
2012-04-02 21:40:16 -07:00
Florian Staudacher
9d3f221f1a
fix the js error when not logged in and on root/landing page, app is undefined
2012-03-29 16:28:53 +02:00
Steven Hancock
e1607baff4
jquery_include_tag helper
...
Implement the jquery_include_tag helper, which is used in several
views but was not implemented in the code. This helper attempts to
load jQuery from the Google CDN (matching the version of the vendored
jquery.js in jquery-rails), falling back to the vendored copy if the
google CDN fails. The helper also loads jquery_ujs.js from jquery-rails.
A jquery_cdn setting is added to application.yml to enable or disable
serving jQuery from the Google CDN (for those podmins who would rather
not use Google's services).
Update app/views/application.html.haml to use the jquery_include_tag
helper since it was the only view that was including the vendored
copy of jquery directly with jquery_include_tag.
2012-03-27 18:07:44 -07:00
danielgrippi
f72f1d4059
more progress
2012-03-27 18:07:22 -07:00
danielgrippi
5b2716d2ef
MS DG; move images to assets
2012-03-27 18:07:22 -07:00
danielgrippi
06936bcdce
stylesheets are basically now being served from sprockets
2012-03-27 18:07:20 -07:00
danielgrippi
5c431d933f
MS DG down to four failures
2012-03-21 13:50:24 -07:00
