Commit graph

13762 commits

Author SHA1 Message Date
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
Jonne Haß
991a505439 Merge pull request #4485 from colindean/rename_bitcoin_wallet_id
change bitcoin_wallet_id to bitcoin_address
2013-09-01 19:24:44 +02:00
Jonne Haß
99657947a9 Merge pull request #4487 from arlogn/word-wrap-on-single-post-view
Prevent overflow of strings too long on single page view
2013-09-01 19:23:07 +02:00
Jonne Haß
58e8df4455 Remove automatic setting of the DB variable from script/server
* It's broken for those that would benefit from it (postgres users)
* It's broken in the design: Reading it from the config requires bundle exec ruby, which requires it being set properly
2013-09-01 19:08:44 +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
arlogn
1b295a88e5 Prevent overflow of strings too long on single page view 2013-09-01 01:41:37 +02:00
Jonne Haß
0cdfc7cfbd Make I18n systems more robust against missing keys in pluralization data
Should make situations like #4468 less frequent
2013-08-30 19:31:48 +02:00
Jonne Haß
9d092c1b2f Merge pull request #4479 from ssrihari/fix-colors-more
Refactored the colors palette a little more
2013-08-30 15:23:05 +02:00
Jonne Haß
e38966cec0 Merge branch 'WebSpider-develop' into develop 2013-08-30 14:44:07 +02: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
Srihari Sriraman
5bd5f9198d Refactored the colors palette a little more
- Introduced text-dark-grey = #666666
- Converted text colors #777777 and #555555 to text-dark-grey
- Removed header-grey in favor of text-grey
- Included colors in a couple of files where it was missing
- Categorized the colors in the palette based on the contexts of usage
2013-08-30 17:58:39 +05:30
Jonne Haß
08dcc8c52d Merge branch 'ssrihari-fix-colors' into develop 2013-08-30 10:37:24 +02:00
Srihari Sriraman
4348fc070d Add border-dark-grey
Substituting -grey for #999

Moving #888 text color to -grey

Adding border-dark-grey

Removing border-dark-grey from places where it isn't appropriate
2013-08-30 10:32:02 +02:00
Jonne Haß
27f671814b Merge pull request #4471 from svbergerem/fix-size-of-images-in-spv
Fix size of images in the SPV
2013-08-29 21:37:10 +02:00
Jonne Haß
770e436ee1 Merge pull request #4472 from svbergerem/fix-mentions-in-preview
Fix preview with more than one mention
2013-08-29 11:42:58 -07:00
Steffen van Bergerem
6bc16bcdba Fix preview with more than one mention 2013-08-29 20:36:49 +02:00
Steffen van Bergerem
642946bd5b Fix size of images in the SPV 2013-08-29 20:05:12 +02:00
Jonne Haß
d40b09878a Merge branch 'ssrihari-hide-inactive-streams' into develop 2013-08-29 14:53:24 +02:00
Srihari Sriraman
3131eb920b Collapsing aspects_list and followed_tags when they aren't active
- Each time a stream is rendered, other lists are emtied
- Using Backbone.history.fragment to detect active stream
- hideInactiveStreamLists is best pushed into a before/after filter

Added tests for hideInactiveStreamLists
2013-08-29 14:51:54 +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
Jonne Haß
26e13c5edf Merge branch 'ssrihari-disable-mark-all-read' into develop 2013-08-29 12:13:32 +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
Jonne Haß
da23efa433 bump redis-namespace even though the security issue does not affect us
The issue only shows if you have a send :exec, user_input in your
codebase, neither we nor Sidekiq does that.

See https://github.com/resque/redis-namespace/issues/64 and
https://github.com/resque/redis-namespace/issues/65#issuecomment-22120560
2013-08-28 23:50:21 +02:00
Jonne Haß
e194a07f18 Merge branch 'develop' of github.com:diaspora/diaspora into develop
Conflicts:
	Changelog.md
2013-08-28 20:43:01 +02:00
Jonne Haß
e24e024f5f Merge branch 'ssrihari-click-to-select-invite-link' into develop 2013-08-28 20:41:33 +02:00
Srihari Sriraman
cbaaf86bae Single click selects the invite link
- Earlier, triple-clicking or drag & select had to be performed to select
- Should consider a copy button

Moving away from the inline onClick handler

It didn't feel right to be writing js in a helper.

Refactoring setupInviteLinks into a sidebar Backbone View
2013-08-28 20:40:28 +02:00
Jonne Haß
7e3373a9a3 Merge pull request #4451 from svbergerem/patch-1
Fix style in profile sidebar / contacts
2013-08-28 04:46:57 -07:00
svbergerem
fa7a03e9a7 Fix style in profile sidebar / contacts 2013-08-28 13:07:01 +02:00
Jonne Haß
ec97c2e760 Merge branch 'ssrihari-color-palette' into develop 2013-08-28 10:25:46 +02:00
Srihari Sriraman
a6dc845f59 First stab at extracting a color palette
- Pulled out the existing palette in _mixins
- Took a stab at naming greys after their usage count in contexts
- Replaced #a40802 with #a80000, since they are very close and $red was already in the palette

Missed importing 'colors' in a couple of places

Removing a redefined  in favor of  in colors.css.scss

Fixing missed imports #2

Renamed $background to $background-white

Explicitly calling out the color of the background, since we have many
background colors
2013-08-28 10:25:04 +02:00
Jonne Haß
b51f48dc88 Travis RVM doesn't know it yet
Revert "bump recommended rubygems version"

This reverts commit e9526ee93f.
2013-08-28 01:37:43 +02:00
Jonne Haß
e9526ee93f bump recommended rubygems version 2013-08-27 23:01:51 +02:00
Florian Staudacher
ba9e715c66 Merge branch '4239-move-federation-stuff-into-lib' of github.com:oliverbarnes/diaspora into oliverbarnes-4239-move-federation-stuff-into-lib 2013-08-27 22:05:27 +02:00
Jonne Haß
18a7210250 Merge branch 'develop' of github.com:diaspora/diaspora into develop 2013-08-27 21:59:49 +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
Jonne Haß
472a294bb8 Merge pull request #4393 from diaspora/improve_tests
Improve tests
2013-08-27 12:52:48 -07:00
Jonne Haß
c94ca826b2 Merge pull request #4448 from ssrihari/fix-invite-code-input-width
Fixing Invite code input width to be same across browsers
2013-08-27 21:48:29 +02:00
Jonne Haß
f86ecdb327 Merge pull request #4441 from ssrihari/user-menu-highlight
Hightlighting the down-arrow next to user name on hover
2013-08-27 21:46:56 +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
Fabian Rodriguez
261ac786c1 avoid use :visible option in capybara finders 2013-08-27 10:59:44 -03:00
Fabian Rodriguez
e9af8d55af reorganize cukes into desktop and mobile folders 2013-08-27 10:59:44 -03:00
Fabian Rodriguez
cdfdf37a17 use #hover instead of execute_script hacks 2013-08-27 10:59:44 -03:00
Fabian Rodriguez
d489dfc8e3 remove unused steps 2013-08-27 10:59:43 -03:00
Fabian Rodriguez
c69853e0cf replace asserts with rspec equivalents 2013-08-27 10:59:43 -03:00
Jonne Haß
625159c8ad start new development cycle 2013-08-27 09:59:46 +02:00
Jonne Haß
eaedba11a3 Merge branch 'release/0.2.0.0' into develop 2013-08-27 09:58:09 +02:00
Jonne Haß
2919c7c73f bump to 0.2.0.0 2013-08-27 09:57:46 +02:00
Jonne Haß
38f01b9cd5 remove extra is in help section [ci skip] 2013-08-27 09:42:34 +02:00
Srihari Sriraman
5b41539985 Fixing Invite code input width to be same across browsers
- It was wide on firefox and narrow on chrome
- This fits it within the parent's padding on all browsers
2013-08-27 11:51:15 +05:30