Commit graph

672 commits

Author SHA1 Message Date
Roger Braun
5bed6d8cf7 Implement a way to deactivate hovercards. 2013-08-22 09:56:35 +02:00
Roger Braun
79a849ad97 Revert "Import mixins."
This reverts commit 1d6802bec43223606e1387d037658eb194c478fb.
2013-08-22 09:56:35 +02:00
Roger Braun
c911248340 Import mixins. 2013-08-22 09:56:35 +02:00
Jonne Haß
fa7b756d4d improve new SPV
* Hopefully fix OEmbed view
* Fix OpenGraph view
* Fix middle border
* Add spacing at the bottom
* Fix comment styles by not including old SPV styles for them (TODO: maybe rescue some stuff there, like the code tag styling)
* Fix avatar size for default avatar
* Remove border below comment pane
* Fix overflow of post body with a lot of text
* Fix stylesheet inclusion
2013-08-22 09:56:35 +02:00
Roger Braun
b8fb70d44e Visual changes to the spv. 2013-08-22 09:56:35 +02:00
Roger Braun
8c695ecec2 Switch to new single post view. 2013-08-22 09:56:35 +02:00
Roger Braun
72f8d58c06 Questionable css for the new single post view. 2013-08-22 09:56:35 +02:00
Roger Braun
958793e338 Implement new single post view. 2013-08-22 09:56:34 +02:00
Roger Braun
46d2240ed4 Add hacky bootstrap header fix for single post view. 2013-08-22 09:56:34 +02:00
flaburgan
149c812d03 add missing sprite file 2013-08-22 09:56:34 +02:00
flaburgan
10e52f970c improve design 2013-08-22 09:56:34 +02:00
flaburgan
d63dc9f0a5 Add images, fix layout rendering 2013-08-22 09:56:34 +02:00
flaburgan
abba8d8dfc Add header to the single post view 2013-08-22 09:56:34 +02:00
Steffen van Bergerem
7fe972555a profile message and mention icons 2013-08-21 23:05:42 +02:00
Steffen van Bergerem
e5e63b09a3 fix opacity of control icons 2013-08-20 12:20:24 +02:00
Steffen van Bergerem
d73da263d9 Unify profile sidebar 2013-08-19 14:57:42 +02:00
Jonne Haß
eea3818c45 streamline new profile sidebar elements
* titlecase "Photos"
* Pull "See all" to the left (to match up with  "View all")
* Replace "See all" with "View all"
2013-08-19 14:26:14 +02:00
Steffen van Bergerem
f22b4d7da7 Change contact list on profile page 2013-08-19 14:02:08 +02:00
mokus
44d76fc6da rename contact_count to item_count 2013-08-19 12:49:38 +02:00
Jonne Haß
caae0d6af6 Merge pull request #4358 from arlogn/2943-fix-embedded-media-over-elements
Fix the overlapping of youtube embedded videos
2013-08-19 09:23:42 +02:00
movilla
d1c679cc22 remove comments from the mobile site. Close #4225 2013-08-16 22:14:52 +02:00
movilla
73825ab94a Remove post from the mobile site 2013-08-16 20:44:22 +02:00
flaburgan
96337ef7d4 Fix regression in header style 2013-08-11 23:23:15 +02:00
flaburgan
820fa4e9b2 Extract and factorize the header css in a new file, fix ugly registration header design 2013-08-11 20:18:40 +02:00
Sean Tilley
e7ea763ab5 Merge pull request #4373 from Flaburgan/patch-4
Make contacts visible in new aspect unchecked by default, close #4343
2013-08-10 15:00:16 -07:00
Jonne Haß
9d157670a4 Merge pull request #4386 from Faldrian/develop
Fixed global search field, will search when a dropdown item is clicked
2013-08-10 14:03:39 -07:00
Jonne Haß
4354e9497a Merge pull request #4376 from Flaburgan/fix-mobile-view
fix mobile view
2013-08-10 12:39:09 -07:00
Faldrian
cc71ce4a2c Fixed global search field, will search when a dropdown item is clicked 2013-08-10 19:59:05 +02:00
flaburgan
895a7c79a3 Remove overflow hidden on welcome banner, close #4377 2013-08-10 00:07:02 +02:00
flaburgan
2e36fd6c67 fix mobile view 2013-08-09 23:12:14 +02:00
Antoine D
ef24275f7c Make contacts visible in new aspect unchecked by default, close #4343 2013-08-09 22:13:40 +02:00
Jonne Haß
a2e5f1f88e Merge pull request #4335 from Team-D/feature/4169-tag_search_autocomplete
#4169 tag search autocomplete
2013-08-06 13:29:12 -07:00
Jonne Haß
a267f2a4db Merge pull request #4354 from Flaburgan/improve-mobile-view
Improve mobile usability

Conflicts:
	Changelog.md
2013-08-06 21:31:55 +02:00
Steffen van Bergerem
8a8fb10b18 auto expand post preview 2013-08-06 20:48:27 +02:00
Jonne Haß
1639ae2b31 Merge pull request #4316 from Flaburgan/feature/4271-refactor-left-side-bar
Feature/4271 refactor left side bar
2013-08-06 11:45:15 -07:00
arlogn
81ebd05d6a Fix the overlapping of youtube embedded videos 2013-08-06 20:34:46 +02:00
flaburgan
aa27b7a1f5 Resize preview button 2013-08-06 18:40:20 +02:00
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +02:00
flaburgan
086d512d83 Improve mobile usability 2013-08-06 17:05:35 +02:00
arlogn
0cccd87259 Cursor pointer on upload-photos button in webkit browsers 2013-08-05 15:07:11 +02:00
mokus
df9a42c397 update search controller + serch.js so that autocomplete works
Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec

Fixed merged conflict in Changelog

update routes and search controller

remove useless except from search controller

Fix indentation in search_controller
2013-08-05 11:49:23 +02:00
Jonne Haß
6689f20710 Merge pull request #4321 from andrewcsmith/feature/4100-add-support-for-posting-to-wordpress-as-a-service
Feature/4100 add support for posting to wordpress as a service

Conflicts:
	Gemfile.lock
2013-08-04 17:15:39 +02:00
Jonne Haß
274faebdd1 another attempt at stabilizing features/signs_up.feature 2013-08-04 17:01:12 +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
Fábián Tamás László
54b166bde9 Opengraph to mobile view 2013-08-04 15:47:10 +02:00
Fábián Tamás László
1a3ead3619 Og info appears only if oembed isn't available 2013-08-04 15:46:42 +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ó
c3a76fa886 Added opengraph content to mood page 2013-08-04 15:42:33 +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
Steffen van Bergerem
f810e39f52 Change image to ajax-loader when closing lightbox 2013-08-02 14:46:15 +02:00
Jonne Haß
5026eccc6a Refactor and reorder backbone app initialization, fixes hovercards
Also added cucumber feature for hovercards
2013-08-01 12:52:16 +02:00
Jonne Haß
2916b8b216 hide other flash messages before showing a new one 2013-07-31 20:17:31 +02:00
carolina
f6fe74aeae Migration to turn ActivityStreams::Photo to StatusMessage
deletes ActivityStream model and all it's references

update migration with the without_protection option to disable mass assignment protection
2013-07-31 15:15:08 +02:00
Jonne Haß
4710144b02 Merge pull request #4293 from Team-D/feature/4274-error_message_vanishes_too_fast
fixes issue 4274 flash-messages stay longer
2013-07-31 15:12:44 +02:00
Sri Vishnu Totakura
f5c8ebcb90 publisher closes when clicked anywhere outside its division after opening
fixed app.publisher undefined error

app view removed and click event binder added in the publisher view initializer.

removed unwanted console log

attempted to fix this.el undefined error
2013-07-31 15:04:57 +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
Jonne Haß
300752fc87 bump capybara
* removed wait_until where possible
* replaced wait_until with DOM obersavtions
* added match: :first to all finders that assumed getting the first element
* replaced evaluate_script with execute_script where possible
* replaced a few execute_script with DOM observations through Capybara
* removed sleep where possible
* replaced sleep with DOM obersvations
* replaced "wait for ajax" with DOM obersavations
* replaced alert confirmation with new selenium API
* bump selenium webdriver
* made any other fixes to get green again
2013-07-31 01:47:23 +02:00
Jonne Haß
cdc29e449d Move facebox configuration into the initialization of the Backbone app
Facebox is already called from some Backbone views very early, making its icons 404 otherwise.
2013-07-29 12:20:05 +02:00
J. Fleming
b75bb8dc0a Change devise config and templates to make logout a delete request. 2013-07-17 21:00:18 +02:00
carolina
8ba60853e9 fixes issue 4274 flash-messages stay longer 2013-07-09 14:35:35 +02:00
rivendale
f2481b0f55 fix link to background image 2013-07-07 18:06:01 -03:00
Tamas Laszlo Fabian
37505c5ece Fixed timago tooltip in conversations
Fixed timeago errors

Added cucumber stuff to test timeago at inbox

Show localized date/time in tooltip

Remove title attributes
2013-07-07 14:43:47 +02:00
Fábián Tamás László
aa472b25de Put preloads into gon.preloads
Fixed tagFollowing not getting into preloads
2013-07-06 12:45:23 +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
kevivmatrix
6623e86a5a private message sending changed to ajax
added specs for change in controller

one form of hash used in single line of code

rendering create response on sending message

redirect user to conversation page if message sent successfully

removed deprecated way of rendering file

conversations create for mobile fixed

minor code style change

updated changelog
2013-07-06 14:35:09 +05:30
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
Steffen van Bergerem
71f03544e4 Don't focus comment form on 'show n more comments' 2013-06-28 20:40:24 +02: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
David Thompson
2e83736f43 Add SASS for sharing message. 2013-06-20 07:39:56 -04: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
Steffen van Bergerem
bcd43cbfee Don't show hovercards for current user in comments 2013-06-09 12:31:18 +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
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
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
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
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
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
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ß
3572ae8d2e Merge branch 'remove_navbar' of git://github.com/movilla/diaspora into movilla-remove_navbar
Conflicts:
	Changelog.md
2013-04-13 13:04:52 +02:00
Jonne Haß
fd069af2c6 Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more
Conflicts:
	Changelog.md
2013-04-13 12:53:31 +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
movilla
bc87b501f2 Fix show more post in my activity mobile page. Close #4108 2013-04-08 00:04:42 +02:00
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02:00