Commit graph

13550 commits

Author SHA1 Message Date
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
Jonne Haß
572472ee4b Merge pull request #4355 from Flaburgan/resize-preview-button
Resize preview button
2013-08-06 11:26:19 -07: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
Jonne Haß
9ec9ae0c6c Merge pull request #4349 from arlogn/webkit-cursor-pointer-on-input-file-button
Cursor pointer on upload-photos button in webkit browsers
2013-08-05 20:35:13 +02:00
Jonne Haß
c67a2deb7c Merge pull request #4350 from andrewcsmith/bug/bump-oauth-wordpress-version
Bumped omniauth-wordpress gem to 0.2.0 for compatability
2013-08-05 09:35:55 -07:00
Andrew Smith
ffca9776d5 Bumped oauth-wordpress gem to 0.2.0 for compatability 2013-08-05 08:21:27 -07:00
arlogn
0cccd87259 Cursor pointer on upload-photos button in webkit browsers 2013-08-05 15:07:11 +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ó
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
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
Jonne Haß
9d6ac1abe5 Merge pull request #4331 from meitar/tumblr-delete-deleted
Tumblr posts should be deleted when users delete their originating Diaspora post.
2013-08-03 14:41:57 +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
Jonne Haß
2e9de37594 add changelog entry for strong parameters [ci skip] 2013-08-02 11:51:43 +02: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
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
e8db2804cb Fix ProfilesController#update spec for tags. 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
carolina
143a970e61 Added strong_parameters gem to Gemfile and created an initializer in config 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
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
James Fleming
2a57f4851a Install strong_parameters 2013-08-02 10:09:04 +02:00
Jonne Haß
1c6ed356cb Merge pull request #4295 from diaspora/update_gems
Update gems
2013-08-01 15:04:32 -07:00
Jonne Haß
a5b654de60 bump coffee-script-source 2013-08-01 23:20:07 +02:00
Jonne Haß
dd9e563322 bump sinon-rails 2013-08-01 23:20:07 +02:00
Jonne Haß
5119759bcf bump uglifier 2013-08-01 23:20:07 +02:00
Jonne Haß
607a2e4eca bump temple 2013-08-01 23:20:07 +02:00
Jonne Haß
f8cb203c87 bump database_cleaner 2013-08-01 23:20:07 +02:00
Jonne Haß
db8b137899 bump warden 2013-08-01 22:21:50 +02:00
Jonne Haß
cc5addf7e2 bump sass 2013-08-01 22:21:50 +02:00
Jonne Haß
af749b2a72 bump redcarpet 2013-08-01 22:21:50 +02:00