nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13796 commits 4 branches 0 tags 121 MiB
Commit graph

13796 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jonne Haß
c5c20926bf Merge pull request #4443 from Flaburgan/fix-check-icon-aspect-dropdown 
Re align check icon in aspect dropdown
 2013-08-26 12:27:01 -07:00
flaburgan
3899e383ee Re align check icon in aspect dropdown 2013-08-26 21:24:02 +02:00
Jonne Haß
5f518fec0d Merge pull request #4405 from svbergerem/feature/add-help-page 
add help page
 2013-08-26 07:03:10 -07:00
Steffen van Bergerem
324b09a72a add help page 2013-08-26 15:26:18 +02:00
Jonne Haß
748b38434f update plural rules and make bosnian available 2013-08-26 13:16:51 +02:00
Jonne Haß
5238004eff updated 58 locale files [ci skip] 2013-08-26 11:06:29 +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
Jonne Haß
20adeae204 add gem updates to changelog [ci skip] 2013-08-25 23:05:44 +02:00
flaburgan
96e18c6a7b Add aspect modification and fix check icon regression on contacts page, close #4397 2013-08-25 21:42:32 +02:00
Fabian Rodriguez
f0c6f8b4a8 Merge pull request #4434 from MrZYX/links_and_branding 
Links and branding
 2013-08-25 12:24:57 -07:00
Fabian Rodriguez
4177e40140 Merge pull request #4438 from MrZYX/spv_paragraph_spacing 
add consistent spacing to paragraphs in the SPV
 2013-08-25 10:23:34 -07: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