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
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
Jonne Haß
f9cb662ff7 enable tooltips in the new SPV 2013-08-22 09:56:36 +02:00
Steffen van Bergerem
e036525e8d Add hover for single-post-actions and fix comment deletion links 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
059521b0aa Actually scroll to the comment box. 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
c356e33f63 Fix text decoration for action buttons. 2013-08-22 09:56:35 +02:00
Roger Braun
690e47c946 Don't collapse comment content in the SPV. 2013-08-22 09:56:35 +02:00
Roger Braun
c6e2a91359 Deactivate content collapsing for SPV. 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
5bed6d8cf7 Implement a way to deactivate hovercards. 2013-08-22 09:56:35 +02:00
Roger Braun
79a849ad97 Revert "Import mixins." 
This reverts commit 1d6802bec43223606e1387d037658eb194c478fb.
 2013-08-22 09:56:35 +02:00
Roger Braun
c911248340 Import mixins. 2013-08-22 09:56:35 +02:00
Jonne Haß
fa7b756d4d improve new SPV 
* Hopefully fix OEmbed view
* Fix OpenGraph view
* Fix middle border
* Add spacing at the bottom
* Fix comment styles by not including old SPV styles for them (TODO: maybe rescue some stuff there, like the code tag styling)
* Fix avatar size for default avatar
* Remove border below comment pane
* Fix overflow of post body with a lot of text
* Fix stylesheet inclusion
 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
8c695ecec2 Switch to new single post view. 2013-08-22 09:56:35 +02:00
Roger Braun
72f8d58c06 Questionable css for the new single post view. 2013-08-22 09:56:35 +02:00
Roger Braun
958793e338 Implement new single post view. 2013-08-22 09:56:34 +02:00
Roger Braun
46d2240ed4 Add hacky bootstrap header fix for single post view. 2013-08-22 09:56:34 +02:00
flaburgan
149c812d03 add missing sprite file 2013-08-22 09:56:34 +02:00
flaburgan
10e52f970c improve design 2013-08-22 09:56:34 +02:00
flaburgan
d63dc9f0a5 Add images, fix layout rendering 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
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
Jonne Haß
554d0a93d0 Do not leak photos in the profile sidebar 2013-08-20 20:56:37 +02:00
Steffen van Bergerem
e5e63b09a3 fix opacity of control icons 2013-08-20 12:20:24 +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
8df8855ac0 remove the limit 3 for @photos in photo controller 2013-08-19 12:49:38 +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
Jonne Haß
caae0d6af6 Merge pull request #4358 from arlogn/2943-fix-embedded-media-over-elements 
Fix the overlapping of youtube embedded videos
 2013-08-19 09:23:42 +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
movilla
795a7a5751 mobile error 500 if a reshared (original) post will be deleted. 2013-08-16 12:07:14 +02:00
Jonne Haß
2207069b86 Merge pull request #4396 from movilla/registration_mobile_width 
Fix layout on the registration page for mobile

Conflicts:
	Changelog.md
 2013-08-14 21:28:17 +02:00
movilla
77c4731157 fix layout on the registration page for mobile 2013-08-14 13:52:52 +02:00
Oliver Azevedo Barnes
c5a1078f45 Moved account_deleter as well, same tests break 2013-08-13 18:37:51 -05:00
Oliver Azevedo Barnes
7214dc184d Remove namespacing from federation libs recently migrated from app/models/ 2013-08-13 18:23:05 -05:00
flaburgan
485c0dae7f Remove placeholders for name fields in settings (no more Sofaer) 2013-08-13 19:03:16 +02:00
Oliver Azevedo Barnes
4b516603f7 Fix #4361 twitter access level check breaking facebook addition to user 
Rewrite twitter access-level check

Fixed tests, still working on getting facebook up

Add heroku example to diaspora.example.yml
 2013-08-12 13:17:18 -05:00
Oliver Azevedo Barnes
1c9d65e94c WIP refactor namespacing for federation libs, into Diaspora::Federated 2013-08-12 13:10:38 -05:00
Oliver Azevedo Barnes
5564644306 WIP 2013-08-12 13:10:38 -05:00
Oliver Azevedo Barnes
689abfb49c Move non-model federation stuff into lib/ 2013-08-12 13:10:38 -05:00
movilla
152c08963a fix mobile search tags 2013-08-12 16:01:26 +02:00
Sean Tilley
a5d7340129 Merge pull request #4388 from MrZYX/4378-reenable_getting_started 
whitelist getting_started as a user settable attribute
 2013-08-12 01:22:51 -07:00
flaburgan
96337ef7d4 Fix regression in header style 2013-08-11 23:23:15 +02:00
flaburgan
820fa4e9b2 Extract and factorize the header css in a new file, fix ugly registration header design 2013-08-11 20:18:40 +02:00
Jonne Haß
14c78da6cd whitelist getting_started as a user settable attribute, fixes #4378 2013-08-11 16:52:54 +02:00
Bender Bending Rodríguez
7086055f4e Bitcoin donations 2013-08-11 15:31:05 +02:00
Jonne Haß
f4169d7f30 Merge pull request #4384 from andrewcsmith/bug/4211-twitter-should-not-cut-links 
Fixed problem where the add_post_link method would truncate the status update in the middle of a link
 2013-08-11 00:25:12 +02:00
Sean Tilley
e7ea763ab5 Merge pull request #4373 from Flaburgan/patch-4 
Make contacts visible in new aspect unchecked by default, close #4343
 2013-08-10 15:00:16 -07:00
Andrew Smith
65a14ccc2c Fixed problem where the add_post_link method would truncate the status update in the middle of a link. This led to sending Twitter broken links. 
Refactored :extract_truncated_link method

Removed complicated while loop in avoiding cutting off links, using refactoring from MrZYX
 2013-08-10 14:40:53 -07:00
Jonne Haß
9d157670a4 Merge pull request #4386 from Faldrian/develop 
Fixed global search field, will search when a dropdown item is clicked
 2013-08-10 14:03:39 -07:00
Jonne Haß
948939cd30 Merge pull request #4381 from goobertron/4380-facebook-count 
Updated Facebook character limit.
 2013-08-10 21:40:44 +02:00
Jonne Haß
4354e9497a Merge pull request #4376 from Flaburgan/fix-mobile-view 
fix mobile view
 2013-08-10 12:39:09 -07:00
Faldrian
cc71ce4a2c Fixed global search field, will search when a dropdown item is clicked 2013-08-10 19:59:05 +02:00
goobertron
8bffdb873a Updated Facebook character limit. 2013-08-10 00:18:49 +01:00
flaburgan
895a7c79a3 Remove overflow hidden on welcome banner, close #4377 2013-08-10 00:07:02 +02:00
flaburgan
2e36fd6c67 fix mobile view 2013-08-09 23:12:14 +02:00
Antoine D
ef24275f7c Make contacts visible in new aspect unchecked by default, close #4343 2013-08-09 22:13:40 +02:00
Oliver Azevedo Barnes
452301b34d Fix #4361 twitter access level check breaking facebook addition to user 2013-08-07 18:59:49 -05: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
Jonne Haß
a267f2a4db Merge pull request #4354 from Flaburgan/improve-mobile-view 
Improve mobile usability

Conflicts:
	Changelog.md
 2013-08-06 21:31:55 +02:00
Jonne Haß
efbd3c8605 Merge pull request #4344 from oliverbarnes/4124-check-twitter-write-access-before-auth 
Issue #4124 Check write access before authorizing Twitter
 2013-08-06 21:21:56 +02:00
Steffen van Bergerem
8a8fb10b18 auto expand post preview 2013-08-06 20:48:27 +02:00
Jonne Haß
1639ae2b31 Merge pull request #4316 from Flaburgan/feature/4271-refactor-left-side-bar 
Feature/4271 refactor left side bar
 2013-08-06 11:45:15 -07:00
arlogn
81ebd05d6a Fix the overlapping of youtube embedded videos 2013-08-06 20:34:46 +02:00
flaburgan
aa27b7a1f5 Resize preview button 2013-08-06 18:40:20 +02:00
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +02:00
flaburgan
086d512d83 Improve mobile usability 2013-08-06 17:05:35 +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
Oliver Azevedo Barnes
55a58713a5 Issue #4124 Check write access before authorizing Twitter 2013-08-05 13:52:19 -05:00
arlogn
0cccd87259 Cursor pointer on upload-photos button in webkit browsers 2013-08-05 15:07:11 +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
Jonne Haß
6689f20710 Merge pull request #4321 from andrewcsmith/feature/4100-add-support-for-posting-to-wordpress-as-a-service 
Feature/4100 add support for posting to wordpress as a service

Conflicts:
	Gemfile.lock
 2013-08-04 17:15:39 +02:00
Jonne Haß
274faebdd1 another attempt at stabilizing features/signs_up.feature 2013-08-04 17:01:12 +02:00
Andrew Smith
2bb6bc8eef Added Wordpress service functionality, 
for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs.

Added model for Wordpress service

Added very very basic Wordpress cross-posting functionality.

Added markdown support to post body

Fixed Wordpress::MAX_CHARACTERS problem

cleanup

Added default settings for Wordpress OAuth

Added default settings for Wordpress OAuth

Added Wordpress to configured services spec.

changelog changes
 2013-08-04 07:46:56 -07:00
Fábián Tamás László
ba3d60b00f Only parse opengraph if oembed is not available 2013-08-04 15:55:09 +02:00
Fábián Tamás László
54b166bde9 Opengraph to mobile view 2013-08-04 15:47:10 +02:00
Fábián Tamás László
43363c13e5 Code style fixes, removed unneeded rescue 2013-08-04 15:47:07 +02:00
Tamas Laszlo Fabian
3cead93dbc Load og data faster (after_save -> after_commit) 2013-08-04 15:46:44 +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
Tamas Laszlo Fabian
22c644c2ae Replaced opengraph with opengraph_parser 
Code style fixes
 2013-08-04 15:44:58 +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
Meitar Moscovitz
7d40fd1add Delete cross-posted Tumblr posts when user deletes their Diaspora post. 2013-08-03 04:23:22 -04:00
Jonne Haß
c7eed23c61 Merge pull request #4223 from svbergerem/3229-change-src-on-closing-lightbox 
Change image to ajax-loader when closing lightbox
 2013-08-02 06:26:49 -07:00
Steffen van Bergerem
f810e39f52 Change image to ajax-loader when closing lightbox 2013-08-02 14:46:15 +02:00
James Fleming
9ca9a6f310 Remove duplicates and bad code habits. 
Remove some blank line.

Do not chain bang methods.
 2013-08-02 11:39:24 +02:00
James Fleming
66a07bd938 Remove attributes protection. 
Use a blacklist approach instead of a blacklist approach in Profile#receive.

Remove attr_accessible from models and make specs pass.
 2013-08-02 11:39:06 +02:00
James Fleming
94e9fc5ac4 Use strong params in profiles_controller 2013-08-02 11:39:06 +02:00
James Fleming
d6ba6d1b02 Use strong params in photos_controller 
Add specs to check mass-assignment gotchas in PhotosController.
 2013-08-02 11:39:05 +02:00