Commit graph

3243 commits

Author SHA1 Message Date
sjain1107
5223a2d906 Adding ignore user icon
Adding ignore user icon

Added jquery

Changed profile.js
2013-09-04 14:47:23 +02:00
Srihari Sriraman
f53aa3e0e5 Highlighting the currently active stream in the leftNavBar
- This gives the user the sense of what he/she is currently viewing
- The hover/selected are the same right now. Needs to change.
- Need to find a more meaningful place for `markSelected`

Moved markSelected to app.views.Stream

- Removes duplication
- All streams create this view, and this seems to do some setup on
  initializing, which is a good place to markNavSelected

Changing highlight on hover to 'black' instead of the blue

- The blue was a little intruisive
- Also fixes the vertical alignment issue

Changing the background to bluebg on hover
2013-09-01 19:32:01 +02:00
Colin Dean
a4ce4404ff change bitcoin_wallet_id to bitcoin_address
It is better to call it an address than a wallet ID, because the latter may
confuse Bitcoin users who conflate the two. They are not the same.

Also adds convenience method to handle the deprecated variable.
2013-08-31 20:16:23 -04:00
Nils Vogels
a3f3bcf6ef Adjusting the description of the 404 message, in order to avoid having
to specify why users got a 404, and possibly leaking information while doing this

See discussion in #3717 for rationale on not implementing specific HTTP codes
This solves around #3717 and #3728

Adjusting travis breakage
2013-08-30 14:42:19 +02:00
Jonne Haß
eda65f3258 Merge pull request #4464 from movilla/profile_mobile_500
Error 500 when visit probile mobile and logged out. Fix #4458
2013-08-29 05:19:18 -07:00
movilla
2b97f74015 error 500 when visit probile mobile and logged out. Fix #4458 2013-08-29 12:18:53 +02: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
svbergerem
fa7a03e9a7 Fix style in profile sidebar / contacts 2013-08-28 13:07:01 +02:00
Jonne Haß
17580c123d Merge pull request #4353 from netom/oembed_to_mobile_view
Added oembed display to mobile stream view

Conflicts:
	app/views/status_messages/_status_message.mobile.haml
2013-08-27 21:59:00 +02:00
Steffen van Bergerem
324b09a72a add help page 2013-08-26 15:26:18 +02:00
Jonne Haß
1067d6a731 fix link to the tutorials in the sidebar [ci skip] 2013-08-26 10:54:27 +02:00
Jonne Haß
f9a3990562 do not leak photos through photos#show 2013-08-26 09:39:39 +02:00
Jonne Haß
e58019fe8e Merge pull request #4440 from Flaburgan/fix-contacts-page
Add aspect modification and fix check icon regression on contacts page, close #4397
2013-08-25 15:46:11 -07:00
flaburgan
96e18c6a7b Add aspect modification and fix check icon regression on contacts page, close #4397 2013-08-25 21:42:32 +02:00
Jonne Haß
348a7b6c5b update branding 2013-08-25 18:21:14 +02:00
Jonne Haß
0d1bf85931 drop outdated hints from right sections 2013-08-25 18:21:14 +02:00
Jonne Haß
2124dba3e8 update header and footer links 2013-08-25 18:21:14 +02:00
Steffen van Bergerem
7fe972555a profile message and mention icons 2013-08-21 23:05:42 +02:00
flaburgan
ba886d127a Valid meta elements, add pod personalization 2013-08-21 10:30:20 +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
carolina
f3817b996e Modify photos unless condition and loop through thumbnails and test 2013-08-19 12:49:39 +02:00
mokus
44d76fc6da rename contact_count to item_count 2013-08-19 12:49:38 +02:00
carolina
d7e6ec8a4c Add photo count 2013-08-19 12:49:38 +02:00
carolina
a7bfc542e1 Add view_all link below photo thumbnails 2013-08-19 12:49:38 +02:00
carolina
9a5691c46a Add to leftsidebar link to photos index + thumbnails from last 3 photos 2013-08-19 12:39:51 +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
485c0dae7f Remove placeholders for name fields in settings (no more Sofaer) 2013-08-13 19:03:16 +02:00
movilla
152c08963a fix mobile search tags 2013-08-12 16:01:26 +02:00
Bender Bending Rodríguez
7086055f4e Bitcoin donations 2013-08-11 15:31:05 +02:00
Antoine D
ef24275f7c Make contacts visible in new aspect unchecked by default, close #4343 2013-08-09 22:13:40 +02:00
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +02:00
Fábián Tamás László
32d86254b5 Added oembed display to mobile stream view 2013-08-06 07:02:04 +02:00
Fábián Tamás László
54b166bde9 Opengraph to mobile view 2013-08-04 15:47:10 +02:00
J. Fleming
b75bb8dc0a Change devise config and templates to make logout a delete request. 2013-07-17 21:00:18 +02: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
fabianfiorotto
3e5b29b289 Fix pagination for people list on the tag stream page
Update _index.html.haml

This params broken the pagination of the followers list in tags page
To reproduce try to paginate in
https://joindiaspora.com/tags/diaspora

test for people pagination patch

reducing the per page limit

removing tabs
2013-07-06 13:10:29 +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
Jonne Haß
3da9b1bf7f Merge pull request #4259 from netom/4173-disable-invite-button
Disable invite button after sending invite

Conflicts:
	Changelog.md
2013-07-06 12:40:05 +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
Fábián Tamás László
6e178af551 Disable invite button after sending invite 2013-07-01 10:19:56 +02:00
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
Jonne Haß
92d3bb9c69 Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin
Admin: find users under the age of 13 (COPPA)
2013-06-29 10:03:59 +02:00
Jonne Haß
837a1ba564 Merge pull request #4238 from Flaburgan/patch-4
Improve participants link style, close #4236
2013-06-27 23:09:40 -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
Florian Staudacher
44fbb6472f Merge branch 'feature/1283-coppa-admin' of https://github.com/diasp/diaspora into diasp-feature/1283-coppa-admin 2013-06-23 13:38:48 +02:00
David Thompson
1e5ef88d8c Use PeopleHelper#sharing_message view helper method in the profile sidebar. 2013-06-19 22:04:07 -04:00