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ß
f9a3990562
do not leak photos through photos#show
2013-08-26 09:39:39 +02:00
Jonne Haß
348a7b6c5b
update branding
2013-08-25 18:21:14 +02:00
Steffen van Bergerem
7fe972555a
profile message and mention icons
2013-08-21 23:05:42 +02:00
Jonne Haß
554d0a93d0
Do not leak photos in the profile sidebar
2013-08-20 20:56:37 +02:00
Roger Braun
e9977af7b1
Fix specs for TemplatePicker
2013-08-16 11:08:22 +02:00
Oliver Azevedo Barnes
8ee26f43e5
Remove commented requires
2013-08-14 15:08:47 -05: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
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
Jonne Haß
14c78da6cd
whitelist getting_started as a user settable attribute, fixes #4378
2013-08-11 16:52:54 +02: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
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ß
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
flaburgan
ac533f8383
Refactor the left bar side menu, improve tag autosuggestion design, close #4271
2013-08-06 18:30:24 +02:00
Oliver Azevedo Barnes
55a58713a5
Issue #4124 Check write access before authorizing Twitter
2013-08-05 13:52:19 -05: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
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ó
0a4b58ac12
rspec test for GatherOpenGraphData worker
...
Added rspec test for og in status_message model
Added rspec test for og_html helper
Improved tests for opengraph embedding
2013-08-04 15:47:09 +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ß
2055a0aef8
Merge branch 'jflemingprod-feature/4143-port_to_strong_parameters' into develop
2013-08-02 11:44:55 +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
e8db2804cb
Fix ProfilesController#update spec for tags.
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
James Fleming
a0a9f01be1
Remove tests for strong parameters
...
Remove a duplicated test.
2013-08-02 11:38:56 +02:00
James Fleming
938de466f8
Strong parameters for Aspect
2013-08-02 10:09:04 +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
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
Ruxton
3c605c47e0
Fix error in facebook service delete_post
...
Add spec coverage for FB delete_post
2013-07-31 14:23:13 +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ß
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
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
Jonne Haß
94207e844c
Drop weird stop in conversations controller spec
2013-06-27 17:50:44 +02:00
Tamas Laszlo Fabian
d59648504d
Added test to avoid regression
2013-06-24 15:37:17 +02:00