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

7032 commits

Author SHA1 Message Date
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
655fbfcd79 Fix timeago on mobile devices. Fix missing space 2014-01-30 10:15:14 +01:00
Steffen van Bergerem
fe01734a3d fix timeago 2014-01-29 03:24:10 +01:00
Raphael Sofaer
300a7c1c31 Merge pull request #4737 from rsofaer/no_retries_for_bad_cert 
Do not retry sending out posts on SSL errors.  See #4728
 2014-01-27 20:11:57 -08:00
Raphael Sofaer
de593f6e9f Do not retry sending out posts on SSL errors. See #4728 
Refactor HydraWrapper so the when-to-retry logic is in the worker
 2014-01-27 15:45:45 -08:00
Dennis Schubert
1f76a9a354 Merge pull request #4739 from MrZYX/stabilize_cukes 
Stabilize cukes
 2014-01-26 14:39:43 -08:00
Florian Staudacher
09a840ea41 fix regression caused by updating backbone.js without updating changed parameters 2014-01-26 19:51:12 +01:00
Steffen van Bergerem
763fb95947 Fix css for keyboard navigation 2014-01-26 04:31:11 +01:00
Jonne Haß
8b8071925d Make toggle aspect call synchronous and bump capybaras wait timeout 
in features/desktop/aspect_navigation.feature:18 we quickly leave the page
before waiting for the request to finish. By making the HTTP call
synchronous we wait for it to finish before we reflect the change in the DOM,
thus giving Capybara a chance to wait for it. Also let Capybara wait longer.
This should random failures of the aforementioned cuke rarer.
 2014-01-26 00:13:06 +01:00
Jonne Haß
f9c230dd31 Merge pull request #4738 from svbergerem/remove-unused-spv-files 
Remove unused beta code
 2014-01-24 04:19:22 -08:00
Steffen van Bergerem
0f156cd9a4 Remove unused beta code 2014-01-24 09:01:30 +01:00
Steffen van Bergerem
7519fcc255 Remove unused cubbies code 2014-01-24 08:58:47 +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
Steffen van Bergerem
3d4bdfb665 Drop number of followers from tags page 2014-01-21 14:49:05 +01:00
Florian Staudacher
5c059b2925 fix regression in conversations causing an infinite recursion (fix #4715) 2014-01-20 22:00:26 +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
Ruxton
a3113cce7c Switched to using rails-timeago to make keeping on top of new versions of plugin easier 2014-01-20 09:33:35 +08:00
goobertron
19c9c0f394 new version of white2x 2014-01-19 14:53:52 +00:00
goobertron
2fb5098be2 Submitted new images with blurred edges 2014-01-19 14:42:34 +00:00
goobertron
97b5c723af Updated image branding and files with refs to them 2014-01-18 13:03:59 +00:00
Steffen van Bergerem
20e1626453 add permalinks for comments 2014-01-17 22:11:17 +01:00
Florian Staudacher
1924c40d38 replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem 
- updates underscore to 1.5.2 and backbone to 1.1.0

backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
  models

other changes:
- fix some events triggering multiple times in connection with deleting
  a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
  * no longer test the backbone router as part of our code
  * jasmine factory already returns model instances, no need to wrap
    that again
 2014-01-16 23:23:30 +01:00
Dennis Schubert
6fc5ccb9f9 Merge pull request #4511 from MrZYX/bump_devise 
update devise to 3.2
 2014-01-15 13:17:48 -08:00
Jonne Haß
d97fd8089b Merge pull request #4688 from ivanzotov/develop 
Fix after_create to after_commit
 2014-01-15 11:47:23 -08:00
Jonne Haß
15b1dae362 update devise to 3.2 2014-01-15 12:59:59 +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
Ivan Zotov
a4ce6e267a Fix after_create to after_commit 2014-01-14 22:35:29 +04:00
Steffen van Bergerem
580068ed7c Remove background from badges in header 2014-01-14 15:00:36 +01:00
goobertron
706b11b14d Now with passing Cucumber tests 2014-01-13 18:14:43 +00:00
goobertron
a1ac848d62 Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting) 2014-01-12 20:02:33 +00:00
Jonne Haß
42f790fa13 Merge pull request #4666 from jaywink/signup-form-error-redirect 
Instead of redirect on signup form validation, render new
 2014-01-11 14:08:18 -08:00
Jonne Haß
7608319787 Merge pull request #4665 from svbergerem/fix-500-conversations 
fix bug in conversations view causing server error
 2014-01-08 23:55:09 -08:00
arlogn
31177e6bdb bookmarklet publisher more usable mobile 2014-01-09 02:33:47 +01:00
Jonne Haß
ca9e2e24ea Merge pull request #4670 from arlogn/bookmarklet-publisher-more-usable 
bookmarklet publisher more usable
 2014-01-07 11:29:50 -08:00
Jason Robinson
35ece9d65f Instead of redirect on signup form validation, render new with submitted data. 2014-01-06 22:12:07 +02:00
Jason Robinson
db71c9c50b Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$ 2014-01-06 22:00:53 +02:00
maruf
c17a474142 Simple captcha for signup page 2014-01-06 22:00:37 +02:00
Jonne Haß
7c9460d5b0 Merge pull request #4667 from Flaburgan/fix-markdown-display 
Fix markdown indication in the publisher when the user upload an image
 2014-01-06 02:22:21 -08:00
arlogn
61bfbc82e0 bookmarklet publisher more usable 2014-01-06 01:07:05 +01:00
Damien Monet
b849d6c641 Fix: remove location when publisher is cleared by user 2014-01-05 11:09:03 +01:00
flaburgan
f758163f2e Fix markdown indication in the publisher when the user upload an image 2014-01-04 15:58:20 +01:00
Steffen van Bergerem
2e50a16567 fix bug in conversations view causing server error 2014-01-04 01:54:45 +01:00
Jonne Haß
2734471feb Merge pull request #4653 from svbergerem/3119-change-more-comments-link 
Change more comments link
 2014-01-02 01:14:33 -08:00
Steffen van Bergerem
55b967caf9 remove participants popover + improve conversations menu 2014-01-01 21:58:56 +01:00
Steffen van Bergerem
ef128575ae Change more comments link 2013-12-30 13:20:58 +01:00
arlogn
ae3b50080c Fix spinner overlapping in webkit search box (#4446) and replace deprecated pseudo class :-moz-placeholder 2013-12-29 17:16:56 +01:00
Jonne Haß
5d83402dc3 Merge pull request #4628 from jaywink/4627-twitter-truncation-problem 
Fix posting to Twitter by correctly catching over limit exception
 2013-12-22 14:14:30 -08:00
Steffen van Bergerem
a96611c259 use bootstrap labels 2013-12-16 00:46:55 +01:00
Steffen van Bergerem
206e3f9422 fix mobile 2013-12-15 23:40:08 +01:00
Jason Robinson
e665ebdab1 Fix posting to Twitter by correctly catching over limit exception (#4627). Also when doing a retry, make smaller cuts to max characters 2013-12-15 22:01:09 +02:00
Steffen van Bergerem
24310fe5a9 change layout 2013-12-15 20:14:55 +01:00
Steffen van Bergerem
5ab777f8cb remove unused code 2013-12-15 18:01:32 +01:00
Steffen van Bergerem
c24cfb432d fix facebox in conversations view 2013-12-15 14:20:47 +01:00
Steffen van Bergerem
c11b744a7f port conversations view to bootstrap 2013-12-15 13:01:24 +01:00
flaburgan
c24d5193e4 Refactor conversations css + fix inconsistent height of conversations list bug 2013-12-15 01:15:44 +01:00
Fabian Rodriguez
c12a45556d fix #2645 
* refactor a bit #weekly_user_stats
  * pass 0 instead of "" to i18n
  * use the first week if none is provided
 2013-12-13 19:32:04 -02:00
flaburgan
6aced29bb6 Add expand the publisher test 2013-12-13 17:55:33 +01:00
flaburgan
923a4f2ab4 Add indication about markdown formatting in the publisher 2013-12-13 16:02:39 +01:00
Jonne Haß
c660c90091 Merge pull request #4612 from diaspora/drop_spv_old_code 
Drop spv old code
 2013-12-11 07:41:51 -08: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
933c3b01ca remove old styles 2013-12-07 12:03:26 -02:00
Fabian Rodriguez
f3f8d36b9d remove wallpaper-mood template 2013-12-06 20:07:37 -02:00
Fabian Rodriguez
ea58324aa8 remove template picker 2013-12-04 20:08:54 -02:00
Fabian Rodriguez
6c8c4fc99e remove template picker functionality 2013-12-03 20:53:00 -02:00
Jason Robinson
2c83d0e846 Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings. 2013-12-02 22:35:18 +02:00
Jonne Haß
1ce027eb2c Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors 
Feature/4509 image upload response errors
 2013-12-02 00:10:25 +01:00
Jonne Haß
d18bbd8405 Merge pull request #4604 from Flaburgan/refactor-mobile-publisher 
Refactor mobile publisher
 2013-12-02 00:07:08 +01:00
Jonne Haß
4b1255fa8d Merge pull request #4592 from Flaburgan/link-show-more-pictures-mobile 
[Ready to review] Fix "more picture" indication (+n) on mobile by adding a link on the indication

Conflicts:
	Changelog.md
 2013-12-02 00:04:37 +01:00
Jonne Haß
8baa06e477 Merge pull request #4590 from diaspora/4432-photo-lightbox-quickfix 
Add lightbox html to unauthenticated header

Conflicts:
	Changelog.md
 2013-12-01 23:58:00 +01: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
Fabian Rodriguez
d7b8cb2997 remove #next_post_path and #previous_post_path from postpresenter 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
92db8cb929 remove #next and #previous from posts_controller 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
6eed63807d remove next and previous functionality from router 2013-12-01 20:55:48 -02:00
flaburgan
748599a9dd Refactor mobile publisher 2013-11-29 12:30:20 +01:00
Richard
dbbead1587 removed double comment 2013-11-28 21:48:41 +11:00
Richard
1b83b6942b Merge branch 'develop' into feature/4509-image-upload-response-errors 2013-11-28 21:46:01 +11:00
Richard
ff07bddd1b using status messages instead of popup and updated specs for publisher view. 2013-11-28 16:08:03 +11:00
Richard
3671f09b1d checking file upload response error and giving an error alert if there is one. 2013-11-28 12:26:30 +11:00
flaburgan
7a50e79cfa Fix aspect dropdown on contacts page 2013-11-27 13:07:31 -08:00
Jonne Haß
05fa086caa replace ugly 'followed by' grammar assumption at tags#show with proper version 2013-11-20 23:47:50 +01:00
Jonne Haß
478159f1cd Merge pull request #4593 from Flaburgan/improve-mobile-design 
Improve notifications and conversations views design on mobile
 2013-11-20 12:05:28 -08:00
Fabian Rodriguez
d8618f8700 Merge pull request #4591 from Flaburgan/avatar-profile-mobile 
Fix avatar display on mobile profile
 2013-11-18 18:17:34 -08:00
flaburgan
e1fb8200dd Move 'mark all as read' button under the title 2013-11-18 18:02:22 -08:00
flaburgan
85eb584e66 Remove useless :page_title indication from people/show 2013-11-16 15:40:03 -08:00
flaburgan
58886a6b30 Improve notifications and conversations views design 2013-11-16 03:06:25 -08:00
flaburgan
a02b0519c9 Fix "more picture" indication (+n) on mobile by adding a link on the indication 2013-11-16 02:06:45 -08:00
flaburgan
76b151eb7d Fix avatar display on mobile profile 2013-11-16 01:57:37 -08:00
Raphael Sofaer
a07d3616a5 Add lightbox html to unauthenticated header 2013-11-15 14:33:46 -08:00
flaburgan
1833edfd67 Add actions to contacts/index.html page 2013-11-12 19:10:00 -08:00
Jonne Haß
859cd83e38 Merge pull request #4583 from Flaburgan/refactor-mobile-header 
Refactor mobile header, close #4579

Conflicts:
	Changelog.md
 2013-11-10 23:55:55 +01:00
flaburgan
0f2773053e refactor mobile header, close #4579 2013-11-09 23:21:32 -08:00
movilla
1fcd675b3e getting started page mobile error 500. Fix #4534 2013-11-09 19:25:32 -02:00
Fabian Rodriguez
146044bd36 Merge pull request #4578 from taratatach/force-comments-sort-order-in-mobile-spv 
force comments sort order in mobile spv
 2013-11-07 18:16:52 -08:00
Erwan Guyader
0afdb134f8 force comments sort order in mobile spv 2013-11-07 17:19:23 -08:00
flaburgan
bee2c63762 Change icon when adding, fix #4568 2013-11-07 12:55:50 -08:00
flaburgan
3df0fdc09b Improve the management of the contacts visibility settings in an aspect 2013-11-07 12:55:35 -08:00
Steffen van Bergerem
d5c3079623 refactor publisher css 2013-11-07 17:12:35 +01:00
flaburgan
47645dd985 Put the stream first in the left menu 2013-11-04 17:46:45 -08:00
Florian Staudacher
1c4ad0986c refactor message creation (conversations) 2013-10-20 22:46:53 +02:00
Florian Staudacher
830747a11e refactor conversations_controller#create 2013-10-10 21:42:46 +02:00
Jonne Haß
eea9467846 refactor twitter service model 2013-09-30 10:13:14 +02:00
Florian Staudacher
260d86d501 refactor ConversationsController, move query builing to User model 2013-09-30 01:44:57 +02:00
Dennis Schubert
6e62a99732 Merge pull request #4542 from Raven24/empty_publishing 
avoid publishing empty posts
 2013-09-25 13:49:52 -07:00
Florian Staudacher
e614562470 avoid publishing empty posts (fixes #4401) 
invalidate empty posts when created by a local user

add changelog entry
 2013-09-24 21:57:22 +02:00
Jonne Haß
5aa13adfb1 Do not fail when environment.sidekiq.retry is set to false, closes #4545 2013-09-24 13:59:07 +02:00
Srihari Sriraman
c379fb351e Removing the conflicting green in colors 
- This was a regression from pull request #4541
- Moved the red color to the section above to separate it from the rgb
  colors that aren't used
 2013-09-23 09:48:45 +05:30
Srihari Sriraman
91d9d5aea5 Removing the comment regarding the source of the lines 
MrZyk pointed out that this information is preserved in git.
 2013-09-22 15:31:27 +05:30
Srihari Sriraman
034361154f Moving colors in variables.scss to colors.scss 
- Fixed the conflicting red color
- Currently using the darker red
 2013-09-22 14:40:56 +05:30
Florian Staudacher
39810e6196 decode URLs before processing them (fixes #4507) 2013-09-21 15:23:30 +02:00
flaburgan
02ef9e08f6 Remove the (now useless) last post link from the user profile. 2013-09-20 17:37:34 -07:00
Jonne Haß
a2b6740fed pluralize admins.user_search.you_currently 2013-09-20 13:21:33 +02:00
Fabian Rodriguez
abc06686ce Merge pull request #4523 from Flaburgan:improve-getting-started 
Conflicts:
	Changelog.md
 2013-09-19 19:37:54 -03:00
Jonne Haß
2296489704 Merge pull request #4532 from Flaburgan/add-help-link 
Add help link
 2013-09-19 14:33:39 -07:00
Jonne Haß
ac13e79225 Merge pull request #4529 from Flaburgan/fix-timeago-color 
Change .timeago color and align notification, fix #4502
 2013-09-19 23:32:32 +02:00
Jonne Haß
e6be888707 Merge pull request #4522 from fubik/transparent_background 
Add a white background to images displayed in the lightbox

Conflicts:
	Changelog.md
 2013-09-19 23:27:57 +02:00
Florian Staudacher
96f80c8cab cleanup jasmine tests 
and added changelog entry for bugfix #4005
 2013-09-19 23:22:49 +02:00
PallaviTS
5caa46cc83 fixing commenting 
Added jamisne tests for comments

Added 2 jasmine tests for fixing commenting

Bugfix: #4005 added changelog entry
 2013-09-19 23:22:48 +02:00
flaburgan
126e7bdc9c Refactor getting_started page, test if facebook is available, fix #4520 2013-09-18 22:06:47 -07:00
flaburgan
0c8adb2070 Add link to the faq in the right panel 2013-09-18 15:53:04 -07:00
flaburgan
fcad95109f Change .timeago color and align notification, fix #4502 2013-09-17 14:50:32 -07:00
Titouan Lorieul
b53c207477 Add a white background to ALL the images in the navigation bar of the lightbox 2013-09-16 18:35:38 +02:00
Titouan Lorieul
1aca1e1e51 Add a white background to the images shown in the navigation bar of the lightbox 2013-09-16 14:18:37 +02:00
Marek Marecki
0b37e9f736 Fix issue #4499: changed :width in .item_count to :min-width 2013-09-14 09:35:15 +02:00
Titouan Lorieul
8bad0673b3 Add a white background to images shown in the lightbox 
Fixes issue #4475
 2013-09-13 09:47:57 +02:00
Titouan Lorieul
26a3f56c22 Disables submit button in sign up form after submission to avoid email already exists error 2013-09-11 20:49:23 +02:00
Jonne Haß
1a8541ff1a Fix another 500 in the mobile site for signed out browsing 2013-09-10 23:41:29 +02:00
Jonne Haß
72e421b38f Merge pull request #4480 from Raven24/publisher_backbone 
Publisher - now with even more Backbone
 2013-09-04 16:52:30 +02:00
Florian Staudacher
b2ff1878e3 move ui feedback into success callback 2013-09-04 14:47:28 +02:00
sjain1107
5223a2d906 Adding ignore user icon 
Adding ignore user icon

Added jquery

Changed profile.js
 2013-09-04 14:47:23 +02:00
Florian Staudacher
306890445e remove obsolete view 2013-09-03 23:18:19 +02:00
Florian Staudacher
41c0880a9d add jasmine specs for uploader, minor changes 2013-09-03 23:18:19 +02:00
Florian Staudacher
bedfacecfd fix jasmine tests 2013-09-03 23:18:18 +02:00
Florian Staudacher
4da696253a implement publisher uploader as backbone view 2013-09-03 23:18:18 +02:00
Florian Staudacher
4090f134f2 port 'getting started' to a backbone view, revert filename changes 2013-09-03 23:18:18 +02:00
Florian Staudacher
9560a8ec61 create actual backbone view for publisher aspect selection 2013-09-03 23:18:18 +02:00
Florian Staudacher
253ab23f5e publisher: extract services into subview 2013-09-03 23:18:18 +02:00
Jonne Haß
5eb5057864 Merge pull request #4351 from netom/3711_fix_stream_render_time 
Batch insert new posts to stream
 2013-09-01 19:36:07 +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
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
Fábián Tamás László
18c22a5e4c Batch insert new posts to stream 2013-09-01 10:16:09 +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
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
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
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
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ß
e194a07f18 Merge branch 'develop' of github.com:diaspora/diaspora into develop 
Conflicts:
	Changelog.md
 2013-08-28 20:43:01 +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
svbergerem
fa7a03e9a7 Fix style in profile sidebar / contacts 2013-08-28 13:07:01 +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
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ß
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ß
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
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
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
flaburgan
3899e383ee Re align check icon in aspect dropdown 2013-08-26 21:24:02 +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
Fabian Rodriguez
f0c6f8b4a8 Merge pull request #4434 from MrZYX/links_and_branding 
Links and branding
 2013-08-25 12:24:57 -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
Jonne Haß
a07950b04a add consistent spacing to paragraphs in the SPV 2013-08-25 18:10:30 +02:00
Srihari Sriraman
e8b00458d3 Adding hover icoons for notifications & conversations 
Added white versions of the icons on hover to match the hover of other
header items.
Changing the notifications hover icon to the regular notifications icon when active so
it is visible with the white background.

Fixing the hard coded background-position value for notifications_grey

Can not depend on generated sprite background position as it will change
with changes in icons

Moving the $icons variable to a broader scope

Since the variable is used in the header, the sprites now are imported
before the header

Using the default sprite map instead of the explicitly created sprite map
 2013-08-25 11:49:34 +02:00
Steffen van Bergerem
0cf50838e1 Add 'no comments' message to SPV 2013-08-23 01:36:58 +02:00
Jonne Haß
d891bcb6e4 Merge pull request #4428 from svbergerem/4421-display-photos-inline 
Fix photos in spv and always show visibility of post
 2013-08-22 11:35:31 -07:00
Steffen van Bergerem
6c2267b9ac fix photos in spv and always show visibility of post 2013-08-22 19:06:06 +02:00
Jonne Haß
75d3b1598f make sure comments are sorted in ascending order from oldest to newest in the SPV 2013-08-22 16:21:51 +02:00
Jonne Haß
1b7bc02eee Merge pull request #4410 from rogerbraun/feature/spv-redesign 
New single post view

Conflicts:
	app/assets/stylesheets/application.css.sass
 2013-08-22 10:37:25 +02:00
Steffen van Bergerem
96436c5ca6 fix notification dropdown 2013-08-22 09:56:36 +02:00
Steffen van Bergerem
f337e4e9a0 add link to person and small fixes 2013-08-22 09:56:36 +02:00
Steffen van Bergerem
532ec72bcf comment button style 2013-08-22 09:56:36 +02:00
Jonne Haß
796b6a805b make sure flash messages are not hidden behind the header in the new SPV 2013-08-22 09:56:36 +02:00
Jonne Haß
0012a82f48 add the footer to the SPV 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
Steffen van Bergerem
0de0d8855c fix weird bug with comment_box focus 2013-08-22 09:56:36 +02:00
Roger Braun
328fb7113f Staying consistent 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
Roger Braun
7c46a74582 Fix login page background. 2013-08-22 09:56:36 +02:00
Roger Braun
ee98cc2bab sass -> scss 2013-08-22 09:56:36 +02:00
Steffen van Bergerem
51ee8b4e93 control icons just visible on hover 2013-08-22 09:56:36 +02:00