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

6775 commits

Author SHA1 Message Date
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
mokus
3ba63197e8 Fixes failing tests by changing user model 2013-08-02 11:39:05 +02:00
James Fleming
0e26a496b8 Strong parameters for User 
Fetch user params instead of require.
 2013-08-02 11:39:04 +02:00
James Fleming
686d3baaad Strong parameters for InvitationsController. 
Make InvitationsController#create spec pass
 2013-08-02 11:39:01 +02:00
James Fleming
b86b409f7d Strong parameters for Conversation 2013-08-02 11:39:01 +02:00
James Fleming
509a407286 Strong parameters for Block 2013-08-02 11:39:01 +02:00
James Fleming
938de466f8 Strong parameters for Aspect 2013-08-02 10:09:04 +02:00
Jonne Haß
5026eccc6a Refactor and reorder backbone app initialization, fixes hovercards 
Also added cucumber feature for hovercards
 2013-08-01 12:52:16 +02:00
Jonne Haß
2916b8b216 hide other flash messages before showing a new one 2013-07-31 20:17:31 +02:00
Plurrtard
6900146852 fix #4163 - Now updating correct contact attribute on retraction 
Added test case for Issue #4163
 2013-07-31 15:20:57 +02:00
carolina
f6fe74aeae Migration to turn ActivityStreams::Photo to StatusMessage 
deletes ActivityStream model and all it's references

update migration with the without_protection option to disable mass assignment protection
 2013-07-31 15:15:08 +02:00
Jonne Haß
4710144b02 Merge pull request #4293 from Team-D/feature/4274-error_message_vanishes_too_fast 
fixes issue 4274 flash-messages stay longer
 2013-07-31 15:12:44 +02:00
Sri Vishnu Totakura
f5c8ebcb90 publisher closes when clicked anywhere outside its division after opening 
fixed app.publisher undefined error

app view removed and click event binder added in the publisher view initializer.

removed unwanted console log

attempted to fix this.el undefined error
 2013-07-31 15:04:57 +02:00
Damien
f4b3f2fd1e Consider Markdown header content as post title 
clarify regexp and correct some bad backtracking

add specs

rewrite regex

convert mardown style title to plain text title

fix bad indentation

add jasmine test for post-viewer.js

tries to fix bad jasmine test
 2013-07-31 14:59:02 +02:00
Jonne Haß
d5fbeff03b Merge branch 'Ruxton-develop' into develop 2013-07-31 14:27:08 +02:00
Ruxton
3c605c47e0 Fix error in facebook service delete_post 
Add spec coverage for FB delete_post
 2013-07-31 14:23:13 +02:00
Jonne Haß
300752fc87 bump capybara 
* removed wait_until where possible
* replaced wait_until with DOM obersavtions
* added match: :first to all finders that assumed getting the first element
* replaced evaluate_script with execute_script where possible
* replaced a few execute_script with DOM observations through Capybara
* removed sleep where possible
* replaced sleep with DOM obersvations
* replaced "wait for ajax" with DOM obersavations
* replaced alert confirmation with new selenium API
* bump selenium webdriver
* made any other fixes to get green again
 2013-07-31 01:47:23 +02:00
Jonne Haß
cdc29e449d Move facebox configuration into the initialization of the Backbone app 
Facebox is already called from some Backbone views very early, making its icons 404 otherwise.
 2013-07-29 12:20:05 +02:00
J. Fleming
b75bb8dc0a Change devise config and templates to make logout a delete request. 2013-07-17 21:00:18 +02:00
carolina
8ba60853e9 fixes issue 4274 flash-messages stay longer 2013-07-09 14:35:35 +02:00
rivendale
f2481b0f55 fix link to background image 2013-07-07 18:06:01 -03: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
Ruxton
dce1531ba6 Changed follow_diasporahq to be configurable to auto follow any user on join. 
Fixing example config file

Updated changelog
 2013-07-06 13:02:27 +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
Jonne Haß
9d4377dc23 Merge pull request #4251 from 0TWAIN0/feature/4182-render-markdown-in-mails 
Feature/4182 render markdown in mails

Conflicts:
	Changelog.md
 2013-07-06 12:20:09 +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
twain
e1ca8df15e added strip_markdown to notification mails 2013-07-03 11:16:31 +02:00
David Thompson
0cc02fb512 Use InviteEmail worker in InvitationsController create action. 2013-07-01 21:10:56 -04:00
David Thompson
33f858b558 Create an InviteEmail worker. 2013-07-01 21:10:56 -04:00
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ß
521aaf894b Merge pull request #4255 from netom/4194-mobile-photo-view 
4194 mobile photo view
 2013-06-29 10:06:46 +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
Steffen van Bergerem
71f03544e4 Don't focus comment form on 'show n more comments' 2013-06-28 20:40:24 +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
Jonne Haß
a6dfdf45e4 ... and make the specs actually pass 2013-06-27 18:07:26 +02:00
Tamas Laszlo Fabian
175908e079 Return 404 for nonexistent photo on mobiles 2013-06-24 15:23:57 +02:00
Florian Staudacher
02be4a5335 make age search postgres compatible, add spec, changelog 2013-06-24 12:34:22 +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
Jonne Haß
9c7237ca1c Merge pull request #4244 from svbergerem/4237-consistent-conversation-list 
Show avatar of recent user in conversation list

Conflicts:
	Changelog.md
 2013-06-22 02:38:54 +02:00
David Thompson
2e83736f43 Add SASS for sharing message. 2013-06-20 07:39:56 -04:00
David Thompson
1e5ef88d8c Use PeopleHelper#sharing_message view helper method in the profile sidebar. 2013-06-19 22:04:07 -04:00
David Thompson
f7cceecb52 Add PeopleHelper#sharing_message method and english localized message text. 2013-06-19 22:03:37 -04:00
Jason Robinson
f30cee3b6e Fix hashtags that start a line when posting to Facebook or Twitter, by applying all the same options to strip_markdown as applying to markdownify, fixes #3768 and #4154 2013-06-20 00:06:13 +03:00
Steffen van Bergerem
ffb150f227 Show avatar of recent user in conversation list 2013-06-19 22:59:05 +02:00
David Thompson
1109658e83 Show the user if a contact is sharing with them when viewing their profile page. 2013-06-19 07:38:14 -04:00
Jonne Haß
221c1bf959 update all wiki links 2013-06-17 20:00:48 +02:00
David Thompson
b3c859bcd5 Check for nil before splitting contact_ids param. 2013-06-15 17:14:30 -04:00
Jonne Haß
ed36786edc Merge pull request #4217 from svbergerem/4041-loading-indicator 
Add loading indicator on tag pages, remove second one from profile page

Conflicts:
	Changelog.md
 2013-06-14 18:23:39 +02:00
Jonne Haß
69db16ab34 Merge pull request #4221 from svbergerem/4123-fix-login-short-password 
Fix login for short passwords
 2013-06-14 09:21:43 -07:00
Jonne Haß
c6d2c714e9 never pass nil to image_tag 
In production that results in a not precompiled error
 2013-06-14 14:47:54 +02:00
Steffen van Bergerem
4cbab628c9 Fix login for short passwords 2013-06-14 12:02:44 +02:00
Steffen van Bergerem
a8ade65e1a Add loading indicator on tag pages, remove the second one from the profile page 2013-06-14 01:25:36 +02:00
Steffen van Bergerem
21ef1c8e41 Remove alpha branding 2013-06-12 23:08:13 +02:00