Commit graph

273 commits

Author SHA1 Message Date
Lukas Matt
1748d3b940 It is now possible to report comments
* Renamed PostReport to Report
* Added report button to SPV
* Updated rspec

refs diaspora/diaspora#4732
refs diaspora/diaspora#4710
refs diaspora/diaspora#4711
refs diaspora/diaspora#4517
2014-05-15 07:23:43 -04:00
Steffen van Bergerem
232e4fa236 Improve set read/unread in notifications dropdown 2014-04-16 23:33:22 +02:00
flaburgan
a4886fa77b SPV: Improve padding and interaction counts 2014-04-13 11:27:12 +02:00
Hincu Petru
57de031f6b I added the validation for blank to poll question and poll answer 2014-04-07 17:17:41 +00:00
Jonne Haß
682a49605e Merge pull request #4910 from hpetru/rewrite-poll-creator
Rewrite poll creation inputs
2014-04-06 22:27:01 +02:00
Hincu Petru
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00:00
Hincu Petru
2ae4d41db3 Fixed 4903 and not render vote form when user is not logged 2014-04-05 14:29:07 +00:00
Hincu Petru
6c00db23cd I update design for poll in post stream 2014-04-03 20:57:14 +00:00
Hincu Petru
cee90e737c Make poll to be compatible with bootstrap 2014-04-03 09:03:54 +00:00
Jannik Streek
9c24365fde changed poll result + some minor text improvements 2014-03-31 18:14:07 +02:00
Jannik Streek
12fabe2fb9 finalized voting design + some design fixes + improved code 2014-03-31 18:14:07 +02:00
Jannik Streek
d0a77ce6b3 design for poll participation implemented, saving works as well 2014-03-31 18:14:07 +02:00
Jonne Haß
24a3a42e90 Merge pull request #4880 from svbergerem/hovercard-bootstrap-style-fixes
Improve hovercard style on Bootstrap pages
2014-03-30 22:34:31 +02:00
goobertron
57d796be1d Fix indentation 2014-03-28 15:21:22 +00:00
Steffen van Bergerem
1fc38278bb Improve hovercard style on Bootstrap pages 2014-03-28 14:00:16 +01:00
goobertron
1dfde65556 Alter link behaviour of OG previews 2014-03-26 19:24:06 +00:00
Steffen van Bergerem
0cc3b10b1f port publisher and bookmarklet to bootstrap 2014-03-10 15:15:40 +01:00
Anton Ilin
88f502236a Fix arguments for hevercardable helper
We should pass person object to the hovecrardable helper. In the
current case `this` is the status message, not the status
author. So, let's pass `author` instead of `this`.
2014-03-07 11:20:45 +02:00
Richard
55efa82756 made a help view spec and cleaned up the views a bit. 2014-02-09 16:00:15 +01:00
Richard
da6b037f24 highlighting menu items when clicked. collapsing questions and answers on the static content help sections.
removed unused help haml templates.

put locales back to how they were and wrote a small js parser to swap in links to help views which have generated links in them.

using locales text for help section headers.
2014-02-09 16:00:15 +01:00
Richard
afec5977e9 Started converting the help section into a backbone view. Things missing are: some urls which were calculated and inserted into the yml, all the pre-existing erb templates are still there, it's still at /faq/faq, nothing has been tested, some of the questions don't collapse and expand.
changed the locales to have the hard coded urls in them because they can no longer be calculated server side. this is pretty crap because i'm going to have to change it for all the languages now so i might change my mind about this later.

deleted some unused views.
2014-02-09 16:00:15 +01:00
Jonne Haß
41a4326993 Merge pull request #4770 from svbergerem/fix-spv-4754
Fix bugs introduced by #4754
2014-02-09 15:57:27 +01:00
Steffen van Bergerem
6c7dde1733 Fix bugs introduced by #4754 2014-02-09 15:54:22 +01:00
goobertron
7bcea07b99 Standardise - code refs to 'messages' to 'conversations' 2014-02-09 15:44:12 +01:00
Steffen van Bergerem
97f1c286f4 improve reshared posts 2014-01-31 22:48:40 +01:00
Steffen van Bergerem
318d190404 SPV small improvements 2014-01-30 22:12:51 +01:00
Steffen van Bergerem
0f156cd9a4 Remove unused beta code 2014-01-24 09:01:30 +01:00
Jonne Haß
0b15e66d06 Merge pull request #4577 from svbergerem/2302-permalink-comments
[Ready to review & merge] Add permalinks for comments

Conflicts:
	app/assets/stylesheets/application.css.sass
2014-01-22 11:24:42 +01:00
Jonne Haß
9ea6e9c166 Merge pull request #4517 from Zauberstuhl/report_post_feature
Added post reporter feature

Conflicts:
	Changelog.md
	app/assets/stylesheets/application.css.sass
	db/schema.rb
2014-01-20 10:03:45 +01:00
Steffen van Bergerem
20e1626453 add permalinks for comments 2014-01-17 22:11:17 +01:00
Lukas Matt
5c9a3aaf3e Added post report feature
You can report a single post by clicking the correct icon in the controler section

Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
2014-01-14 15:00:55 -05:00
Steffen van Bergerem
ef128575ae Change more comments link 2013-12-30 13:20:58 +01:00
Fabian Rodriguez
80015e7ba8 move everything under post-viewer/ to single-post-viewer/ 2013-12-08 12:36:01 -02:00
Fabian Rodriguez
8cf4e4a7fb remove old templates 2013-12-08 11:39:36 -02:00
Fabian Rodriguez
f3f8d36b9d remove wallpaper-mood template 2013-12-06 20:07:37 -02:00
Fabian Rodriguez
cfc247db75 remove PostViewerFeedback 2013-12-01 20:55:49 -02:00
Fabian Rodriguez
9be780468d remove PostViewerInteractions 2013-12-01 20:55:49 -02:00
Fabian Rodriguez
bf3ee8d7bb remove PostViewer 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
179cc9e8dd remove PostViewerAuthor 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
0702db137a remove PostViewerNav 2013-12-01 20:55:48 -02:00
flaburgan
1833edfd67 Add actions to contacts/index.html page 2013-11-12 19:10:00 -08:00
Srihari Sriraman
0bcc62f07f Disable 'Mark all as read' for notifications when everything is read
- This action needn't be performed when all notifications are read,
  hence disabling it is a good practice
- Added a link-disabled-color
- Used css pointer-events to disable clicking on the link

Preventing default on click for the mark_all_read_link

- avoiding the use of pointer-events
- setting up disabled only for mark_all_read_link

Moved disabling of the link to a global handler

- Added disabled class to the button in /notifications when all are read
- Styled the disabled button
- Adding disabled class after completion of ajaxRequest
2013-08-29 12:12:26 +02:00
Srihari Sriraman
623d517e89 Hightlighting the down-arrow next to user name on hover
- the right-arrow wasn't highlighted on hover, which was
  inconsistent with the other header items

- changed the user-menu items highlight color from #fff to #fafafa, which is
  consistent across the header

- refactored the css to reduce specificity

- refactored css to use nesting in class names instead of nesting in
  scss (as advocated by http://smacss.com) to reduce specificity and
  to enhance readability
2013-08-28 00:13:24 +05:30
Steffen van Bergerem
324b09a72a add help page 2013-08-26 15:26:18 +02:00
Steffen van Bergerem
0cf50838e1 Add 'no comments' message to SPV 2013-08-23 01:36:58 +02:00
Steffen van Bergerem
6c2267b9ac fix photos in spv and always show visibility of post 2013-08-22 19:06:06 +02:00
Steffen van Bergerem
f337e4e9a0 add link to person and small fixes 2013-08-22 09:56:36 +02:00
Steffen van Bergerem
a354745283 fix reshare button when already reshared 2013-08-22 09:56:36 +02:00
Jonne Haß
f0b68ff6d1 restyle informational section in the new SPV 2013-08-22 09:56:36 +02:00
Jonne Haß
f9cb662ff7 enable tooltips in the new SPV 2013-08-22 09:56:36 +02:00
Jonne Haß
ee960ae9fd polish SPV a bit
* Move lock icon to the timestamp
* Add spacing around the interation icons
* Increased size of the interaction icons
* Pulled root post author next to reshare author
2013-08-22 09:56:36 +02:00
Roger Braun
867efeb80f Add comment focus button. 2013-08-22 09:56:35 +02:00
Roger Braun
9996cbaf15 Add divider between action buttons and content. 2013-08-22 09:56:35 +02:00
Roger Braun
44ee6b4892 User entypo font for large icons.. 2013-08-22 09:56:35 +02:00
Roger Braun
a875ce7011 Fix typo. 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
958793e338 Implement new single post view. 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
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
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +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
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
J. Fleming
b75bb8dc0a Change devise config and templates to make logout a delete request. 2013-07-17 21:00:18 +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
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
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
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
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
embs
e7daa978e3 Show timestamp when hovering on comment time-ago string. Closes #4042 2013-03-08 00:33:19 -03:00
Jonne Haß
0cf1c2d020 Sort tag followings alphabetically, not in reverse, fixes #3986 2013-02-24 16:22:01 +01:00
Asphyxia
b91ed859a1 Hovering a Timeago-String should show the Timestamp 2013-01-31 13:43:37 -03:00
Jonne Haß
cb640b91b3 Merge pull request #3880 from Ruxton/feature/oembed_providers
Oembed Update - Added instagram, better display for rich/photo
2013-01-25 07:50:24 -08:00
Asphyxia
f2c67b0d8a Overflow comment textarea 2013-01-24 22:52:14 -03: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
Asphyxia
284c40b4da Issue #3840: Fix extra blank on streams 2013-01-18 15:25:01 -03:00
Asphyxia
c0dd888e61 Issue #3832: Logged-out users stream options 2013-01-18 15:10:13 -03:00
Fabián Rodríguez
d7574a9efb add locale to aspects 2013-01-16 19:59:10 -02:00
Fabián Rodríguez
29c48ca557 Add ability to toggle aspects 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
572e6b5639 render aspects client side 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
62fc9880f9 add aspects_list handlebar template 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
00ef2ce1c0 add aspect\'s handlebar template 2013-01-16 19:33:19 -02:00
Jonne Haß
beb32ce91f hovercards everywhere (comments, likes, top left sidebar stream summary thingy...)
Say a word if you think it's getting too much...
2013-01-01 22:59:12 +01:00
Jonne Haß
fde28e9bea display hovercards in reshares and on the linked name 2012-12-30 15:17:48 +01:00
Florian Staudacher
0092acd492 re-add hovercards
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
2012-12-28 22:37:13 +01:00
Jonne Haß
7b548fd571 Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags
port tagFollowings to BackBone
2012-11-25 09:30:47 -08:00
Jonne Haß
5f6e03cfe5 Merge pull request #3714 from marpo60/refactor
Housekeeping
2012-11-22 01:06:05 -08:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Fabián Rodríguez
3d061d92c6 remove unused templates 2012-11-06 21:39:35 -02:00
movilla
5a2b22ff0c reshares_count come back! 2012-11-06 21:05:48 +01:00
Jonne Haß
3dbbbbe979 bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl to avoid name clashes 2012-09-12 21:22:34 +02:00
Florian Staudacher
e19d73792d oembed video info 2012-06-25 15:25:09 +02:00
danielgrippi
51d71bf394 DG MS; added scrollspy wip
Conflicts:

	app/assets/javascripts/app/pages/stream.js
	app/assets/templates/stream-frame.jst.hbs
2012-05-30 16:58:21 -07:00