Commit graph

3231 commits

Author SHA1 Message Date
Jason Robinson
48a332f871 Remove by default markdown formatting from posts done via service, currently only used by Twitter. Remove markdown also from Facebook posts. 2012-11-09 00:04:49 +02:00
Sean Tilley
7dfa6299ec Merge branch 'reshares_count_stream' of https://github.com/movilla/diaspora into movilla-reshares_count_stream
Conflicts:
	Changelog.md
2012-11-07 21:04:52 -06:00
Braulio Martinez
ab3a7d991c Remove ugly whitespaces 2012-11-07 23:16:25 -02:00
Braulio Martinez
3260bada38 Remove posts#new action from Rails and related tests 2012-11-07 23:14:35 -02:00
movilla
5a2b22ff0c reshares_count come back! 2012-11-06 21:05:48 +01:00
Jason Robinson
7fafabdb60 Only include url to post for twitter when post exceeds maximum length or contains photos 2012-11-03 23:25:19 +02:00
Jonne Haß
2a45470232 Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services
Conflicts:
	Changelog.md
	app/models/services/facebook.rb
	spec/models/services/facebook_spec.rb
2012-11-02 11:31:47 +01:00
Jason Robinson
e974d2934f Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items 2012-11-02 00:23:33 +02:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Jonne Haß
1a93ccd548 don't error out if the root of a reshare of a reshare got deleted, fixes #3546 2012-10-24 19:51:31 +02:00
Dennis Schubert
5ea998a382 Change 'unless' to 'if' again because 'unless' is wrong here.
Also, add some specs and add it to the changelog.
2012-10-24 00:27:45 +02:00
Florian Staudacher
0057e9ed46 some small code style changes + final fix for postgres (milliseconds)
+ updated changelog
2012-10-21 16:10:27 +02:00
Ruxton
25b57cdd2a trying to stabilize issue with datetime in test suite 2012-10-21 16:08:57 +02:00
Ruxton
a78cb352e6 updated spec to fix to_datetime issue
Conflicts:
	spec/lib/diaspora/fetcher/public_spec.rb
2012-10-21 16:08:57 +02:00
Florian Staudacher
2694c930a5 Merge pull request #3645 from Raven24/fix-link-regex
simplify link regex and fix #3553
2012-10-19 02:24:24 -07:00
Gonzalo
e1756b5b3f Privatize non-action controller methods 2012-10-14 19:32:53 -02:00
Gonzalo
78953fe2bf Move ApplicationController specs to application_controllers_spec 2012-10-14 19:32:53 -02:00
Jonne Haß
92e4cd34ae --amend cause I've no time 2012-10-14 01:11:53 +02:00
Jonne Haß
894af48579 add spec to ensure include_community_spotlight? is correctly passed into EvilQuery::MultiStream.new 2012-10-14 01:09:00 +02:00
Gonzalo
83809c924a Refactor MessagesController 2012-10-13 17:10:52 -02:00
movilla
ebd1b28b2d Fix problem javascript with read-unread notifications on notifications popup 2012-10-13 15:16:06 +02:00
Fabián Rodríguez
82082005ba redirect users back on registration failure 2012-10-11 19:47:04 -02:00
Florian Staudacher
ded69477ba replace the monstrous link regex with a slightly less complicated one,
based on the one from the markdown parser, fixes #3553
adding a list of urls for testing the regex in the specs
2012-10-11 23:39:44 +02:00
Jonne Haß
3eb628c2a3 fix french javascript pluralization rule and add specs for locale loading 2012-10-09 22:36:30 +02:00
Florian Staudacher
a9bec8a4ee Merge branch 'hotfix/oembed-selector' into develop
fix for the click event handler on oembed-ed content
2012-10-03 19:12:48 +02:00
Florian Staudacher
bf82fc17fe fix oembed onclick behavior + specs 2012-10-03 19:05:17 +02:00
Jonne Haß
5c7a9c1ce6 Release cleanup, closes #3620
* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
2012-09-30 22:26:23 +02:00
Florian Staudacher
8678c14735 Merge pull request #3589 from MrZYX/refactor_config
New configuration system, details: see changelog
2012-09-30 13:07:40 -07:00
David McMullin
586e23727c add specs for chromeframe
fix typo in ChromeFrame itself
remove unneccessary chromeframe meta tags from layouts
2012-09-30 17:04:50 +01:00
Marek Lewandowski
125e45cdba Force user to authenticate instead of raising error 2012-09-29 16:57:34 +02:00
Jonne Haß
89c1fd5f7f query the set url only through #pod_uri in the app 2012-09-26 20:19:37 +02:00
Jonne Haß
2a4db54db9 New configuration system
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
2012-09-26 20:19:37 +02:00
Jonne Haß
7a478704d5 just stop settingslogic from breaking rspec output for now 2012-09-26 18:54:14 +02:00
Jonne Haß
e70e48d6ca some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
Devendra
a2fa083c3e added rspec tests and refactored user model to use scope, for daily, monthly, and yearly actives 2012-09-22 01:56:34 +05:30
Jonne Haß
8674f5aea2 Merge branch 'hotfix/redis_url' into develop 2012-09-18 15:55:32 +02:00
Jonne Haß
2f9dbdbd86 use self instead of AppConfig to query redis_url inside AppConfig 2012-09-18 15:52:57 +02:00
Florian Staudacher
8193978fd2 in 'standalone' mode, the close button is hidden
... publisher is embedded into something, that has its own close button
2012-09-17 20:46:33 +02:00
Florian Staudacher
452de1b866 fix remaining cukes and some cleanup 2012-09-17 20:35:38 +02:00
Florian Staudacher
200887ca45 adapt jasmine specs to the new structure 2012-09-17 15:33:52 +02:00
Jonne Haß
6c1a1ec6d2 it's enviroNment 2012-09-15 18:52:12 +02:00
Jonne Haß
4bada36bf1 do not redirect admin to his profile upon sign in 2012-09-14 15:01:19 +02:00
Jonne Haß
358ed79f99 Merge branch 'update_devise'
Conflicts:
	Gemfile.lock
2012-09-12 15:11:34 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +02:00
Jonne Haß
58d1448085 update factory girl 2012-09-12 13:24:23 +02:00
Jonne Haß
7ec2f8f419 finish beta striping
A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc
2012-09-12 07:51:19 +02:00
Jonne Haß
ab0ad630df strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep 2012-09-12 05:48:12 +02:00
Jonne Haß
088446e86e bump rspec-rails, remove deprecated rspec syntax 2012-09-11 00:46:36 +02:00
Jonne Haß
8a759c3aca Use Builder::XChar.encode instead of to_xs in spec 2012-09-07 00:09:43 +02:00
Jonne Haß
a488dd50c4 follow up of last commit fixing remaining specs
changed spec since it didn't actually test what it said
2012-09-06 22:11:04 +02:00