Commit graph

6532 commits

Author SHA1 Message Date
Jonne Haß
221c1bf959 update all wiki links 2013-06-17 20:00:48 +02:00
David Thompson
b3c859bcd5 Check for nil before splitting contact_ids param. 2013-06-15 17:14:30 -04:00
Jonne Haß
ed36786edc Merge pull request #4217 from svbergerem/4041-loading-indicator
Add loading indicator on tag pages, remove second one from profile page

Conflicts:
	Changelog.md
2013-06-14 18:23:39 +02:00
Jonne Haß
69db16ab34 Merge pull request #4221 from svbergerem/4123-fix-login-short-password
Fix login for short passwords
2013-06-14 09:21:43 -07:00
Jonne Haß
c6d2c714e9 never pass nil to image_tag
In production that results in a not precompiled error
2013-06-14 14:47:54 +02:00
Steffen van Bergerem
4cbab628c9 Fix login for short passwords 2013-06-14 12:02:44 +02:00
Steffen van Bergerem
a8ade65e1a Add loading indicator on tag pages, remove the second one from the profile page 2013-06-14 01:25:36 +02:00
Steffen van Bergerem
21ef1c8e41 Remove alpha branding 2013-06-12 23:08:13 +02:00
Steffen van Bergerem
a02fdc6e45 unify ignore and hide #bugmash #monday 2013-06-12 14:11:06 +02: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
Steffen van Bergerem
bcd43cbfee Don't show hovercards for current user in comments 2013-06-09 12:31:18 +02:00
Jason Robinson
3fa9f6414d Fix Twitter crossposting (#2758). Refactor some service posting related code. 2013-06-08 17:38:07 +03:00
Steffen van Bergerem
17876d1de6 show medium avatar in hovercard 2013-06-07 11:23:28 +02:00
Florian Staudacher
f694a40992 use tooltip plugin to display the name under the avatar
(temporary solution until the proposed solution from the
[pull request](https://github.com/diaspora/diaspora/pull/4149) is
implemented)
2013-06-04 17:14:00 +02:00
Florian Staudacher
c2a9cb55ef Merge branch 'add_conv_participants_preview' of https://github.com/marpo60/diaspora into marpo60-add_conv_participants_preview 2013-06-04 17:12:38 +02:00
Florian Staudacher
b7b4edeeb0 Merge branch 'reoponed_issue3897' of https://github.com/RoonyH/diaspora into RoonyH-reoponed_issue3897 2013-06-04 16:43:16 +02:00
Juan Azambuja
3f3fe3ecc7 Add participants preview con conversations 2013-06-01 12:14:16 -03:00
Steffen van Bergerem
272cf60788 Add back-to-top button on tag and user pages 2013-05-31 02:02:14 +02:00
Juan Azambuja
e59066bd66 Fix icons-deletelabel styles 2013-05-27 10:25:04 -03:00
Aruna Herath
7803df5ecd Changed post/comment submit keyboard shortcut to ctrl+enter from shift+enter
Fixes reopened #3897
2013-05-27 17:08:39 +05:30
Liane Nakamura
5f25a52676 Fix post iframe src url
Add test for posts helper
2013-05-26 20:49:56 +02:00
Fabián Rodríguez
aed81c1b3b Fix tags ordering in chrome 2013-05-25 15:44:53 -03:00
Jonne Haß
3b03a7cdde strip trailing newlines from stripped markdown 2013-05-25 15:55:20 +02:00
Jonne Haß
d331242d94 Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop
Conflicts:
	Changelog.md
2013-05-25 13:50:28 +02:00
Jonne Haß
272f405ab7 Merge pull request #4177 from svbergerem/4157-post-preview-tag-page
Fix #4157: post preview from tag pages
2013-05-25 04:46:58 -07:00
Jonne Haß
f2f7800b30 drop fallback donation form 2013-05-25 13:37:17 +02:00
Steffen van Bergerem
7f596cfd36 Fix #4157: post preview from tag pages 2013-05-25 12:39:01 +02:00
Dennis Schubert
cdb4be14ce Merge branch 'hotfix/v0.1.0.1' into develop 2013-05-20 21:29:17 +02:00
Jonne Haß
286e948054 federate location 2013-05-20 21:26:04 +02:00
Dennis Schubert
e33f4e68a8 Fix 500 caused by deleted reshares 2013-05-20 21:25:58 +02:00
Ruxton
48b48470bc Service.delete_post now more generic, for future implementations
Service.delete_post now accepts post to be more generic and supports deleting post from any service that overrides delete_post(post)
2013-05-20 12:19:39 +08:00
Maxwell Salzberg
66911801f7 use ActiveRecord#find_each to prevent memory spikes in our workers 2013-05-19 20:33:04 -07:00
Ruxton
ba0e2509c9 Twitter service removes status from twitter when post is revoked 2013-05-20 11:00:49 +08:00
Jonne Haß
ac147cc9f4 Refactor config/ directory
* Get rid of early pathname requirement
* Use require_relative where approciate
* Drop unused files
* Imported new application.rb, environment.rb and environments/* from fresh Rails app
* Cleaned up boot.rb
* Load config in boot.rb
* Deduplicate environments/integration*.rb
* Move username blacklist into defaults.yml
* Ruby 1.9 Hash syntax everywhere
* Reorganize lib/diaspora/markdownify to match conventions
* Get rid of full path requires where possible
* Add dummy content to production section diaspora.yml.example to prevent warning
* Drop sqlite? method
* Move postgres? method into ConfigurationMethods
* Drop token authentication from User
2013-05-19 18:54:54 +02:00
Jonne Haß
11eecc3d3a 404, not 500, if signed out user wants to see a non public/existing post
Also add some specs for Post#find_by_guid_or_id_with_user
2013-05-18 20:55:22 +02:00
Jonne Haß
aa60fac217 Merge branch 'error_404_mobile' of git://github.com/movilla/diaspora into movilla-error_404_mobile
Conflicts:
	Changelog.md
2013-05-18 20:06:49 +02:00
Jonne Haß
f5a4bc51c2 Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop
Conflicts:
	Changelog.md
	app/views/layouts/_header.html.haml
2013-05-18 20:03:59 +02:00
Steffen van Bergerem
63040bb8cc fix mentions at the end of a post 2013-05-17 19:27:08 +02:00
Steffen van Bergerem
da532e18bd Fix preview with locator feature 2013-05-08 13:07:13 +02:00
Jonne Haß
6b1fdaafc0 Merge branch 'locator' of git://github.com/tangosource/diaspora into tangosource-locator 2013-05-06 17:33:10 +02:00
eloydegen
eb5bc379d1 Update _header.html.haml
Change blog url, now there is no 301 required :)
2013-05-06 16:27:40 +03:00
Marco Gallardo
4aab8762fa Locator feature
added marker image for publisher, showing div for address, and added
functionality to close it when clicking 'X' image

showing marker image in publisher

renamed map-marker to locator

fixed style for map marker image in publisher

added locator.js to get user's location

loading google maps api

removed unecessary append and showing location next to publisher

moved location address inside div and  added image to close location

styled div location address an image to close location

removing location when clicking close image

cleaned code

cleaned code

showing loader while location is being obtained, translated normal js to
backbone structure, created locations db stuff, and removing location
div when clicking 'share'

refactored code; started to move code to backbone

refactored js code; moving functionality to backbone structure

created address function to make accessible address variable value

refactored locator.js

showing and removing location div from dom

created location; it belongs_to status_message

added location model and created association with status_message

added hidden field for location address and added respective code on js files to retrieve it on ajax call

saving location for status_message (post)

removing location when sharing

renamed locator backbone view to location, added template, showing
location, and saving lat and lng

prepared and added template to show location

added location to post model in order to have it accessible in backbone

retrieving location to show it in template

removed console.log XD

fixes when removing location

cleanind location_address hidden field when location is removed

more fixes; showing location when sharing

saving location just when it exists

created method to retrieve location address just when location was created

fixed issue about showing 'Near from' message when there was not any location

added style for location

cleaned code

renamed locator view

retrieving lat and lng from locator.js

saving lat and lng in location_coords

saving lat and lng

added style for input location_address

removed location_address  hidden field; the value will be taken directly from input with the location

replaced div with location for input; the user will be able to edit the place

avoiding submitting the form when pressing Enter key on new input for location

added missed spec file for location model

refactored location_view code

refactored location_view code

cleaned code

added sinon library for testing

added describes for new publisher's view functions

created test for destroyLocation function

added test for showLocation publisher view function

created test for avoidEnter publisher view function

removed unnecessary div

Created first test for locations view, added more specs, added Sinon.js,
and fixed issue with assets

loading locator.js for tests

moved location stuff to app/assets

moved locator.js and sinon.js to app/assets

fixed route for images

included locator.js to assets

fixed issue when post object is different than StatusMessage; also fixed issue with lat and lng

loading Sinon for specs

refactoring locator errorGettingposition and start replacing google maps stuff with OSM

added OpenLayers JS, osmlocator, and added them into the main js

changing the locator from Google to OSM instance

changing lat and lng value in the backbone view

removing google javascript tag in application layout

adding jasmine to locator test and removed locator.js

adding jasmine to locator test using OSM

adding Jasmine test to OSM locator

removed locator.js

removed require locator and updated schema

fixed js response; added location

since we are using OSM Locator we don't need locator-spec test

fixed spec for location view; we are not using google maps anymore

changed description of osmlocator-spec

fixed issue with status-message-location template

fixed style for location_address textbox

fixed tests for locator

moved split function to model

created test for location model

removed puts

added effect for location marker

added translations for locator

removed conflicting-unnecessary lines that were loading files for specs

removed sinon library; using sinon-rails gem

removed useless code

removed puts; added Rails.logger.error

added sinon.js file

added specific version of sinon-rails gem

improving validations sintax

using openlayers-rails gem

removed 'google API' text

using sinon gem

isolating LocationStream view

refactored validation

getting location when post is a Reshare

refactored code

fixed aligment for elements under location message

improved styling for location message

refactored begin-rescue block

getting absolute root instead of just the root

added address method to retrive address of location

removed code from Post model; also added descriptinon why it was removed

removed validation when retrieving address; with latest refactorizations we dont need them any more

interpolated location; using file in locales

fixed width for div of location

moved Sinon gem into development and test group

fixed method's description

added missed indexes

updated schema with locations table

removed openlayers-rails gem

preventing location to be saved if there are not coordinates

fixed spec; wrong closing tag
2013-05-02 17:31:53 -05:00
Braulio Martinez
00a3332013 Remove unnecessary ruby187 hacks 2013-05-02 10:07:30 -03:00
movilla
19d22a8928 fix missing translation back to top 2013-05-01 19:22:53 +02:00
rivendale
b77c6f8a86 fix missing indent for correct header container relative positions 2013-04-29 01:27:54 -03:00
Jonne Haß
ea792246d0 bump sidekiq 2013-04-25 21:30:35 +02:00
movilla
5839d304db Fix reactions link on mobile broken 2013-04-25 13:55:57 +02:00
movilla
f17d16385f mobile private post dont show error 404 2013-04-24 22:17:47 +02:00
Jonne Haß
25b3f6bcdc Merge pull request #4127 from marpo60/fix_aspects_max_selection
Fix select & deselect all aspects check image
2013-04-22 08:34:13 -07:00
Juan Manuel Azambuja
de7044c602 Fix select & deselect all aspects check image 2013-04-21 21:38:03 -03:00