Commit graph

56 commits

Author SHA1 Message Date
Srihari Sriraman
e8b00458d3 Adding hover icoons for notifications & conversations
Added white versions of the icons on hover to match the hover of other
header items.
Changing the notifications hover icon to the regular notifications icon when active so
it is visible with the white background.

Fixing the hard coded background-position value for notifications_grey

Can not depend on generated sprite background position as it will change
with changes in icons

Moving the $icons variable to a broader scope

Since the variable is used in the header, the sprites now are imported
before the header

Using the default sprite map instead of the explicitly created sprite map
2013-08-25 11:49:34 +02:00
Steffen van Bergerem
7fe972555a profile message and mention icons 2013-08-21 23:05:42 +02:00
Andrew Smith
2bb6bc8eef Added Wordpress service functionality,
for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs.

Added model for Wordpress service

Added very very basic Wordpress cross-posting functionality.

Added markdown support to post body

Fixed Wordpress::MAX_CHARACTERS problem

cleanup

Added default settings for Wordpress OAuth

Added default settings for Wordpress OAuth

Added Wordpress to configured services spec.

changelog changes
2013-08-04 07:46:56 -07:00
Antoine D
8e2633f8b3 Improve participants link style in conversation, close #4236
Move it to the right and replace the text by an image with the nice tooltip, modify the test.
2013-06-28 00:41:44 +02:00
Steffen van Bergerem
21ef1c8e41 Remove alpha branding 2013-06-12 23:08:13 +02:00
Juan Azambuja
e59066bd66 Fix icons-deletelabel styles 2013-05-27 10:25:04 -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
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
8747e6601d [Sprites] add sprites for branding 2013-03-11 19:26:57 -03:00
Juan Manuel Azambuja
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
Florian Staudacher
2c7f2d6fbb Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment
[ci skip]
Conflicts:
	Changelog.md
2012-12-07 17:47:19 +01:00
movilla
491c2a537c Add feature contact pod admin 2012-12-06 15:26:49 +01:00
Flaburgan
aee6068412 Resize deletelabel and ignoreuser images to align them 2012-12-02 13:20:24 +01:00
Liam
c9559b93f5 Update cat image so it's secure - new image from khanb1 on flickr. 2012-12-02 10:31:45 +00:00
movilla
c9b58c9ff6 Add My Activity icon mobile 2012-10-26 22:47:43 +02:00
Sean Tilley
e2a2767a74 remove alpha from branding 2012-10-19 13:47:27 -05:00
Daniel Grippi
b8f7d025d5 update landing page 2012-08-24 13:45:05 -07:00
movilla
75402bdfa0 Add icons search & contacts mobile 2012-08-21 16:50:37 +02:00
Maxwell Salzberg
54a6ac0c6f add poduptime asset 2012-08-19 17:34:33 -07:00
Florian Staudacher
1fb016597d remove leftover edges from spinner, remove red bg color (fixes #3338) [ci skip] 2012-06-18 23:40:55 +02:00
danielgrippi
ed9c57e7db made loader transparent [ci skip] 2012-05-24 11:17:05 -07:00
danielgrippi
34d98a6d3c fixed some styling during the framing process [ci skip] 2012-05-23 18:47:01 -07:00
danielgrippi
5b3fcd07f3 added texture directory to assets/images [ci skip] 2012-05-23 17:28:02 -07:00
danielgrippi
b736741ab8 added better images to framer [ci skip] 2012-05-23 17:07:41 -07:00
danielgrippi
2a37491be0 changed service icons; icons for template picker [ci skip] 2012-05-23 15:09:57 -07:00
danielgrippi
64a73fb665 new post types. remove old ones. yeah. 2012-05-21 18:45:01 -07:00
danielgrippi
f4c06c8f88 add rounded buttons to the composer flow; slay multi-photo option 2012-05-18 19:46:51 -07:00
Maxwell Salzberg
f24b1f1550 remove a bunch of unused assets [ci skip] 2012-05-17 15:14:51 -07:00
danielgrippi
132bdd3bc5 change create and edit buttons on new profile; remove old press assets 2012-05-11 15:12:22 -07:00
danielgrippi
4b8cd8eb23 whoopsies on landing [ci skip] 2012-05-11 01:30:15 -07:00
danielgrippi
b5fbefad4b this changes profile background colors to be dark, and sets up the groundwork for uploading user-selected background images for their profiles. all the styling is in place; what remains is creating a new image uploader and (possibly) a new controller action.
for information on what command to use to darken the background image that's uploaded, see line 11 in `_profile.scss`.  the current image tests in the public folder are results of the convert command noted.
2012-05-06 12:35:10 -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
5821a84024 validations and all that jazz [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
40347038f8 DG RY; mostly done, validations pending [ci skip] 2012-05-04 17:38:07 -07:00
danielgrippi
699b0cff16 don't expose follow/unfollow to a user in the UI
following is good for bookkeeping in the database, but provides confusion, and could limit likes and/or commenting to start receiving notifications in a conversation.
2012-04-28 11:07:18 -07:00
danielgrippi
05683de16b removed some old assets; added a link to profile edit next to quick stats on a profile page 2012-04-27 17:41:59 -07:00
danielgrippi
c413a494d7 retina-ify icons; fix 404 scrolling issue; serif -> san-serif in some style [ci skip] 2012-04-26 20:25:25 -07:00
danielgrippi
e55b305bca better 404 page. with kittens. 2012-04-26 19:52:41 -07:00
danielgrippi
0b3926d810 fixed / removed some assets [ci skip] 2012-04-26 15:23:51 -07:00
danielgrippi
152101484c updated some assets, THX RO. [ci skip] 2012-04-26 15:02:59 -07:00
danielgrippi
d3b874b020 add basic profile info to profile; remove random console.logs [ci skip] 2012-04-26 14:52:48 -07:00
danielgrippi
43518a9447 added home button nav on profile page [ci skip] 2012-04-26 12:29:22 -07:00
Dennis Collinson
7346921473 MS DC; you can now kill a post on your profile. 2012-04-24 20:46:09 -07:00
danielgrippi
b2ab11944e changed play button for videos [ci skip] 2012-04-24 19:54:09 -07:00
danielgrippi
c82e339640 follow button in [ci skip] 2012-04-24 19:40:33 -07:00
danielgrippi
3704170416 I <3 ROBOTO. [ci skip] 2012-04-23 19:17:31 -07:00
danielgrippi
51a6a3c8a3 added stars [ci skip] 2012-04-23 17:43:32 -07:00
danielgrippi
affba80524 tweak profile top layout [ci skip] 2012-04-23 16:43:32 -07:00
danielgrippi
b6fc97a2a4 added styling & color to text posts [ci skip] 2012-04-22 16:21:22 -07:00
danielgrippi
ab7ac667d8 only focus on photos for now with ratios. one thing at a time, yo.
i've temporarily removed all the arbitrary text switching for now (which is still in version control // which we will get to later)
also moved photo dimensions into a dimensions hash in photo.rb.
2012-04-21 20:42:50 -07:00