Commit graph

3422 commits

Author SHA1 Message Date
Liane Nakamura
5f25a52676 Fix post iframe src url
Add test for posts helper
2013-05-26 20:49:56 +02:00
Fabián Rodríguez
aed81c1b3b Fix tags ordering in chrome 2013-05-25 15:44:53 -03:00
Jonne Haß
d331242d94 Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop
Conflicts:
	Changelog.md
2013-05-25 13:50:28 +02:00
Jonne Haß
009209d939 bump Typhoeus and refactor HydraWrapper 2013-05-25 13:45:37 +02:00
Jonne Haß
286e948054 federate location 2013-05-20 21:26:04 +02:00
Ruxton
48b48470bc Service.delete_post now more generic, for future implementations
Service.delete_post now accepts post to be more generic and supports deleting post from any service that overrides delete_post(post)
2013-05-20 12:19:39 +08:00
Ruxton
20c38a0489 Fix dispatcher_spec to depend on Tumblr which isn't retracting 2013-05-20 11:00:49 +08:00
Ruxton
ba0e2509c9 Twitter service removes status from twitter when post is revoked 2013-05-20 11:00:49 +08:00
Jonne Haß
11eecc3d3a 404, not 500, if signed out user wants to see a non public/existing post
Also add some specs for Post#find_by_guid_or_id_with_user
2013-05-18 20:55:22 +02:00
Steffen van Bergerem
63040bb8cc fix mentions at the end of a post 2013-05-17 19:27:08 +02:00
Jonne Haß
848e5d2a57 try to fix Jasmine failure on CI by not overwriting app.views.Location in spec 2013-05-16 23:33:54 +02:00
Marco Gallardo
4aab8762fa Locator feature
added marker image for publisher, showing div for address, and added
functionality to close it when clicking 'X' image

showing marker image in publisher

renamed map-marker to locator

fixed style for map marker image in publisher

added locator.js to get user's location

loading google maps api

removed unecessary append and showing location next to publisher

moved location address inside div and  added image to close location

styled div location address an image to close location

removing location when clicking close image

cleaned code

cleaned code

showing loader while location is being obtained, translated normal js to
backbone structure, created locations db stuff, and removing location
div when clicking 'share'

refactored code; started to move code to backbone

refactored js code; moving functionality to backbone structure

created address function to make accessible address variable value

refactored locator.js

showing and removing location div from dom

created location; it belongs_to status_message

added location model and created association with status_message

added hidden field for location address and added respective code on js files to retrieve it on ajax call

saving location for status_message (post)

removing location when sharing

renamed locator backbone view to location, added template, showing
location, and saving lat and lng

prepared and added template to show location

added location to post model in order to have it accessible in backbone

retrieving location to show it in template

removed console.log XD

fixes when removing location

cleanind location_address hidden field when location is removed

more fixes; showing location when sharing

saving location just when it exists

created method to retrieve location address just when location was created

fixed issue about showing 'Near from' message when there was not any location

added style for location

cleaned code

renamed locator view

retrieving lat and lng from locator.js

saving lat and lng in location_coords

saving lat and lng

added style for input location_address

removed location_address  hidden field; the value will be taken directly from input with the location

replaced div with location for input; the user will be able to edit the place

avoiding submitting the form when pressing Enter key on new input for location

added missed spec file for location model

refactored location_view code

refactored location_view code

cleaned code

added sinon library for testing

added describes for new publisher's view functions

created test for destroyLocation function

added test for showLocation publisher view function

created test for avoidEnter publisher view function

removed unnecessary div

Created first test for locations view, added more specs, added Sinon.js,
and fixed issue with assets

loading locator.js for tests

moved location stuff to app/assets

moved locator.js and sinon.js to app/assets

fixed route for images

included locator.js to assets

fixed issue when post object is different than StatusMessage; also fixed issue with lat and lng

loading Sinon for specs

refactoring locator errorGettingposition and start replacing google maps stuff with OSM

added OpenLayers JS, osmlocator, and added them into the main js

changing the locator from Google to OSM instance

changing lat and lng value in the backbone view

removing google javascript tag in application layout

adding jasmine to locator test and removed locator.js

adding jasmine to locator test using OSM

adding Jasmine test to OSM locator

removed locator.js

removed require locator and updated schema

fixed js response; added location

since we are using OSM Locator we don't need locator-spec test

fixed spec for location view; we are not using google maps anymore

changed description of osmlocator-spec

fixed issue with status-message-location template

fixed style for location_address textbox

fixed tests for locator

moved split function to model

created test for location model

removed puts

added effect for location marker

added translations for locator

removed conflicting-unnecessary lines that were loading files for specs

removed sinon library; using sinon-rails gem

removed useless code

removed puts; added Rails.logger.error

added sinon.js file

added specific version of sinon-rails gem

improving validations sintax

using openlayers-rails gem

removed 'google API' text

using sinon gem

isolating LocationStream view

refactored validation

getting location when post is a Reshare

refactored code

fixed aligment for elements under location message

improved styling for location message

refactored begin-rescue block

getting absolute root instead of just the root

added address method to retrive address of location

removed code from Post model; also added descriptinon why it was removed

removed validation when retrieving address; with latest refactorizations we dont need them any more

interpolated location; using file in locales

fixed width for div of location

moved Sinon gem into development and test group

fixed method's description

added missed indexes

updated schema with locations table

removed openlayers-rails gem

preventing location to be saved if there are not coordinates

fixed spec; wrong closing tag
2013-05-02 17:31:53 -05:00
Braulio Martinez
00a3332013 Remove unnecessary ruby187 hacks 2013-05-02 10:07:30 -03:00
Jonne Haß
322f4da4d8 Embed associated photos into the status message xml 2013-04-21 19:44:09 +02:00
Jonne Haß
fd069af2c6 Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more
Conflicts:
	Changelog.md
2013-04-13 12:53:31 +02:00
Jonne Haß
7a0d1c647a Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+enter
3897 submit a comment by shift+enter
2013-04-13 03:49:40 -07:00
Jonne Haß
bef05c14d7 Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop
Conflicts:
	Changelog.md
2013-04-10 18:24:47 +02:00
Braulio Martinez
c651cbab78 Always redirect user to downcase version of tags on UTF-8 encoding 2013-04-10 00:08:58 -03:00
Aruna Herath
b0879dd256 added same feature to publisher 2013-04-08 19:29:36 +05:30
Aruna Herath
5f6ce87a23 added shift+enter key from new comment box to submit the comment. 2013-04-08 19:08:29 +05:30
movilla
bc87b501f2 Fix show more post in my activity mobile page. Close #4108 2013-04-08 00:04:42 +02:00
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02:00
Jason Robinson
9c0c5a7258 Include missing javascript in bookmarklet, regression introduced in commit ffc6c1102e. Fixes #4057 2013-04-07 00:06:02 +03:00
Dennis Schubert
f3b7d57b3a Merge pull request #3993 from MrZYX/sidekiq
Sidekiq (+ some cleanup)
2013-04-03 15:19:15 -07:00
Steffen van Bergerem
a693a0970b added hotkeys to navigate in stream 2013-04-02 19:24:20 +02:00
L3MNcakes
8eed16c245 Issue #3976: Send a profile update alongside a sharing notification
Issue #3976: Send a profile update alongside a sharing notification
2013-03-24 06:04:47 +00:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq.
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
2013-03-21 23:39:07 +01:00
Jonne Haß
3fc3b249e7 End the require mess
* Rename and reorganize post fetcher to fix autoloading, also let it use
  Faradays default connection so we get nice redirects
* Add initializer to load libs at a central place
* added lib dir to autoload_once paths to increase thread safety
* Moved lib/exceptions.rb to lib/diaspora/ to conform namespacing
2013-03-21 23:37:53 +01:00
Florian Staudacher
47046013ae Merge pull request #4061 from MrZYX/gemfile_rework
rework Gemfile
2013-03-16 05:02:35 -07:00
Jonne Haß
2afa2899c5 rework Gemfile 2013-03-15 21:00:27 +01:00
Juan Manuel Azambuja
06dc53749a delete unused javascript views 2013-03-15 14:39:34 -03:00
Florian Staudacher
0de68fb713 Merge pull request #4029 from MrZYX/4027-unicode-tags
decode tag name before passing it into TagFollowingAction
2013-03-11 05:51:54 -07:00
Jason Robinson
affa713616 If post has photos, always include url in post to Facebook to stay consistant with other servies, fixes #3706 2013-03-10 08:15:12 +02:00
Jonne Haß
60bd29aa68 decode tag name before passing it into TagFollowingAction, fixes #4027 2013-03-08 13:47:55 +01:00
pestrada
18aeeb052b reset comment box height after posting a comment
refactor create comment method
2013-03-07 12:55:03 -06:00
Marcelo Dominguez
88e76448b6 Avoid unnecessarily redirect 2013-03-03 23:10:53 -02:00
Jonne Haß
7a89d8b161 only try to delete a post from a service if we're able to 2013-03-01 18:54:01 +01:00
Jonne Haß
1256fda24b make randomly on postgres failing spec pending for now 2013-03-01 03:54:44 +01:00
Jonne Haß
7b56c2dd52 Do not fail on receiving a SignedRetraction via the public route 2013-03-01 03:38:36 +01:00
Jonne Haß
c5ecc872ce add integration spec for retracting a comment 2013-02-28 17:20:33 +01:00
Jonne Haß
ccedb6eff0 delegate parent_author to the target of a RelayableRetraction 2013-02-28 17:01:58 +01:00
Jonne Haß
cf9659de4a fix XSS vulnerability in conversations#new, closes #4010 2013-02-26 19:09:30 +01:00
pestrada
3f3409a0a5 avoid posting empty comments
fix Jasmine test

updated changelog with bugfix #3836

fix changelog update

remove wrong bug fix line
2013-02-25 18:27:46 -06:00
Jonne Haß
0cf1c2d020 Sort tag followings alphabetically, not in reverse, fixes #3986 2013-02-24 16:22:01 +01:00
Jonne Haß
35350d1ceb Include reshares in the public user feed, closes #1781 2013-02-21 14:32:28 +01:00
Jonne Haß
ba9aee5902 update changelog; replace "pre" releases with a plain "head" 2013-02-18 20:20:50 +01:00
Jonne Haß
1f4787aa6d Merge pull request #3980 from L3MNcakes/feature/facebook_delete
Feature/facebook delete
2013-02-18 11:17:51 -08:00
L3MNcakes
1120cba5f0 Issue #3939: Posts to Facebook do not delete 2013-02-18 18:21:59 +00:00
Jonne Haß
f3093ca8ae Merge pull request #3864 from Raven24/aspect_memberships
[WIP] aspect membership dropdown Backbone.js rework
2013-02-17 05:54:12 -08:00
Florian Staudacher
4cbae601e8 [WIP] aspect membership dropdown Backbone.js rework
* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships

TODO
* more tests
2013-02-17 13:40:10 +01:00
Jonne Haß
0a124acdf0 Revert "fix regression from #3968"
Revert "Merge pull request #3968 from marpo60/limit_shareable_from_person_queries"

This reverts commit ddfc558a9b.
This reverts commit 30ed4b4e70, reversing
changes made to f50ce2cb1d.

limiting the fetch of the IDs breaks paginating, there's no quick way to fix that

I left the spec in for future use.
2013-02-16 23:48:10 +01:00
Jonne Haß
ddfc558a9b fix regression from #3968
Not ordering the IDs caused incorret ones returned

The spec is totally at the wrong level but I couldn't make
something up that exposed the bug at a deeper level :(
2013-02-16 23:22:14 +01:00
Lennart Prelle
2d0abe8309 added a id and a autoscroll to first unread message in conversation (Fix: #3216) 2013-02-11 16:15:01 +01:00
Ruxton
60f5173c77 Spec coverage for changelog_url and adjustment to behaviour 2013-02-04 11:00:57 +08:00
Jonne Haß
b8128d356b Merge branch 'hotfix/0.0.2.4' into develop
Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb
2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28 Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948
From a quick look at the for us available databases this was not actually used in the wild.
2013-02-01 22:20:31 +01:00
Asphyxia
6df84ed703 Fix wrong message on infinite scroll on contact page 2013-01-31 23:09:51 -03:00
Jonne Haß
baadb49ebf Merge pull request #3844 from asphxia/feature/3672-reshare-alert-box-appearing-twice
Issue #3672: Reshare alert box is appearing twice
2013-01-31 11:13:13 -08:00
Jonne Haß
01299ee8e8 update spec to match overriden translation 2013-01-31 19:25:30 +01:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -03:00
Jonne Haß
4eb98cd7dc Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile
Conflicts:
	Changelog.md
2013-01-29 14:58:11 +01:00
movilla
0010819343 add settings web mobile 2013-01-27 20:38:19 +01:00
Ruxton
e8decc200e Adding jasmine coverage for oEmbed updates 2013-01-25 23:47:49 +08:00
Ruxton
60024d7e20 Someone isn't a StarWars fan. 2013-01-25 22:43:56 +08:00
Jonne Haß
64b86b27c1 bump rspec-rails and rspec
fix two specs by not checking for object identity
2013-01-17 02:00:03 +01:00
Fabián Rodríguez
d7574a9efb add locale to aspects 2013-01-16 19:59:10 -02:00
Fabián Rodríguez
f978a75b8c bootstrap my_aspects data 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
c0417fab93 add specs for the aspects 2013-01-16 19:33:20 -02:00
Diaspora Europe
ac3b2bc99f pod version in footer and updated link to changelog #3705 2013-01-15 16:45:10 +01:00
Fabián Rodríguez
aabbea6ee2 fix issue #3671 reshare a post multiple times 2013-01-12 04:52:56 -02:00
Diaspora Europe
c8ddba6b3e add images to notifications 2013-01-11 12:30:12 +01:00
Florian Staudacher
0092acd492 re-add hovercards
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
2012-12-28 22:37:13 +01:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
movilla
c1b858a877 Mark all unread post-related notifications as read, if one of this gets opened 2012-12-24 00:13:32 +01:00
Florian Staudacher
94760f4c04 update jasmine gem, removed useless spec, + changelog) 2012-12-07 21:21:27 +01:00
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Jonne Haß
bf698f3882 Do not strip "markdown" in links when posting to services, fix #3765 2012-11-26 14:16:43 +01:00
Jonne Haß
7b548fd571 Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags
port tagFollowings to BackBone
2012-11-25 09:30:47 -08:00
rschaden
49d4079065 add email validation to invitations 2012-11-25 14:25:20 +01:00
Bobby Wilson
abd4e17daf Fix #3750 2012-11-22 13:00:47 -07:00
Jonne Haß
c59bb35087 Merge pull request #3754 from marpo60/housekeeping
Housekeeping2
2012-11-22 01:06:30 -08:00
Jonne Haß
5f6e03cfe5 Merge pull request #3714 from marpo60/refactor
Housekeeping
2012-11-22 01:06:05 -08:00
Fabián Rodríguez
be2db47f02 remove unnecesary stuff from specs 2012-11-21 18:26:17 -02:00
Fabián Rodríguez
99abc22403 remove unused methods 2012-11-21 18:26:17 -02:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Jason Robinson
c437636131 Fix message_spec test and add tests for private message notification unread count. Update changelog 2012-11-12 22:00:13 +02:00
Jonne Haß
63f2d335a4 Merge branch 'notifications_count' of git://github.com/movilla/diaspora into develop 2012-11-11 15:00:46 +01:00
movilla
554fe40235 Web mobile notificacions count dont change to unread-read when click in link post 2012-11-11 14:45:07 +01:00
Jonne Haß
4fc2cb1cba bump carrierwave 2012-11-11 13:29:40 +01:00
movilla
10aea3ebce add test :unread => true 2012-11-10 23:23:08 +01:00
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
Fabián Rodríguez
4056c0da9e remove unused method #can_add? 2012-11-06 21:39:36 -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
Jonne Haß
81442f0f2a Erb::Util.h now escapes ' which it didn't before
this is what 3.2.8 actually fixes to prevent XSS iirc
We're including the raw message in the atom feed so
we should test for it
2012-09-06 21:12:49 +02:00
Jonne Haß
60e8107763 remove percent memory/swap usage info in testsuites 2012-09-06 20:36:56 +02:00
Florian Staudacher
2e3da0cf05 fix date and guid assignment for fetched posts 2012-09-06 18:16:40 +02:00
Florian Staudacher
99c6b8bf45 don't test for actually deleted likes,
instead check whether the `retract` method was called, everything
else should be tested there.
2012-09-05 23:48:23 +02:00
Maxwell Salzberg
e0408e6fae dont auto beta flag anyone 2012-08-20 10:39:14 -07:00
Florian Staudacher
645fa76b20 make the "last post" link show ownly if the person has any posts
(fixes #3437)
2012-08-09 15:12:22 +02:00
Florian Staudacher
1a94a24fde fix autolinking links that start with just www... and not a complete http://...
(fixes #3468)
2012-08-09 13:09:06 +02:00
Florian Staudacher
fb9da740bb Merge pull request #3482 from Raven24/public-fetcher
first working version of a 'post fetcher' for remote accounts
2012-08-08 06:42:45 -07:00
Florian Staudacher
6613522097 implement "special symbols" (switch certain strings for utf-8 symbols), fixes #3140 2012-08-08 00:26:20 +02:00