Commit graph

307 commits

Author SHA1 Message Date
Fabián Rodríguez
aed81c1b3b Fix tags ordering in chrome 2013-05-25 15:44:53 -03:00
Steffen van Bergerem
7f596cfd36 Fix #4157: post preview from tag pages 2013-05-25 12:39:01 +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
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
movilla
5839d304db Fix reactions link on mobile broken 2013-04-25 13:55:57 +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
Florian Staudacher
c1b680e51d show username of the services in the publisher
original work by @Ruxton
rebased and extended to include feedback from the original PR #3959
2013-04-21 23:29:04 +02:00
Jonne Haß
7a0d1c647a Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+enter
3897 submit a comment by shift+enter
2013-04-13 03:49:40 -07:00
Jonne Haß
bef05c14d7 Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop
Conflicts:
	Changelog.md
2013-04-10 18:24:47 +02:00
Jonne Haß
15418eae67 Merge pull request #4112 from marpo60/issues_4017_4107_fixes
close issues #4017 and 4107 by including jquery.textchange
2013-04-10 07:58:30 -07:00
Braulio Martinez
c651cbab78 Always redirect user to downcase version of tags on UTF-8 encoding 2013-04-10 00:08:58 -03:00
Juan Manuel Azambuja
5a85fd71f1 close issues #4017 and 4107 by including jquery.textchange 2013-04-09 16:21:19 -03:00
Aruna Herath
b0879dd256 added same feature to publisher 2013-04-08 19:29:36 +05:30
Aruna Herath
5f6ce87a23 added shift+enter key from new comment box to submit the comment. 2013-04-08 19:08:29 +05:30
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02:00
Steffen van Bergerem
a693a0970b added hotkeys to navigate in stream 2013-04-02 19:24:20 +02:00
Marcelo Casiraghi
b0f76f1764 Fix confirmation at getting_started page 2013-03-25 23:09:38 -03:00
Jonne Haß
e51443b3ef Merge pull request #4059 from marpo60/remove_unnecessary_javascript_views
delete unused javascript views
2013-03-15 11:45:22 -07:00
Juan Manuel Azambuja
06dc53749a delete unused javascript views 2013-03-15 14:39:34 -03:00
Jonne Haß
8f6ae75423 Merge pull request #4039 from marpo60/diaspora_with_sprites
Add Sprites to Diaspora!
2013-03-15 09:44:27 -07:00
Fabián Rodríguez
0a3e242e79 fix reshares in single post-view 2013-03-11 22:45:25 -03:00
Juan Manuel Azambuja
2556f08b89 [Sprites] update sprites after develop merge 2013-03-11 20:16:16 -03: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
0de68fb713 Merge pull request #4029 from MrZYX/4027-unicode-tags
decode tag name before passing it into TagFollowingAction
2013-03-11 05:51:54 -07:00
movilla
7a8269ebf3 * Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile
* Complete the existing: Post mobile.
* Complete some test for no mobile: Edit profile, Post main.
* Fix little error css and js mobile.
* Add file-upload-custom javascripts to mobile.js.
2013-03-10 15:02:18 +01:00
Jonne Haß
60bd29aa68 decode tag name before passing it into TagFollowingAction, fixes #4027 2013-03-08 13:47:55 +01:00
pestrada
18aeeb052b reset comment box height after posting a comment
refactor create comment method
2013-03-07 12:55:03 -06:00
Jonne Haß
df1abefc1c Merge pull request #4015 from movilla/upload_photo_1
Fix css and js error with upload photo mobile
2013-02-27 17:11:04 -08:00
movilla
9b2d3c66bf fix css and js error with upload photo mobile 2013-02-28 01:09:40 +01:00
Jonne Haß
b1cdc30367 Merge pull request #4004 from movilla/upload_photo
Upload photo mobile. Close #3324
2013-02-26 15:30:09 -08:00
movilla
76b1e9b0dc Add the ability to upload photos from the mobile site 2013-02-26 23:25:58 +01:00
pestrada
3f3409a0a5 avoid posting empty comments
fix Jasmine test

updated changelog with bugfix #3836

fix changelog update

remove wrong bug fix line
2013-02-25 18:27:46 -06:00
Jonne Haß
0cf1c2d020 Sort tag followings alphabetically, not in reverse, fixes #3986 2013-02-24 16:22:01 +01:00
movilla
5769abcc32 Include our custom fileuploader on the mobile site too 2013-02-20 16:01:08 +01: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
Lennart Prelle
2d0abe8309 added a id and a autoscroll to first unread message in conversation (Fix: #3216) 2013-02-11 16:15:01 +01: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
Asphyxia
6df84ed703 Fix wrong message on infinite scroll on contact page 2013-01-31 23:09:51 -03:00
Asphyxia
07ae4e618c Repeated post on stream fails when content is the same 2013-01-31 22:01:09 -03:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -03:00
Asphyxia
b91ed859a1 Hovering a Timeago-String should show the Timestamp 2013-01-31 13:43:37 -03:00
Asphyxia
389e93a3ae Stream form on profile page 2013-01-31 00:15:27 -03:00
Jonne Haß
4eb98cd7dc Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile
Conflicts:
	Changelog.md
2013-01-29 14:58:11 +01:00
movilla
0010819343 add settings web mobile 2013-01-27 20:38:19 +01:00
Ruxton
89042078ca Oembed Update - Added instagram, better display for rich/photo 2013-01-22 22:37:36 +08:00
Asphyxia
1af0f4bf2d Issue #3828: Unify hide and ignore options 2013-01-18 16:08:02 -03:00