Commit graph

595 commits

Author SHA1 Message Date
Lukas Matt
218845d5b4 Changed and renamed database columns
* changed user_id type to integer
* renamed post_id to item_id
* renamed post_type to item_type
2014-05-15 07:23:44 -04:00
Lukas Matt
1748d3b940 It is now possible to report comments
* Renamed PostReport to Report
* Added report button to SPV
* Updated rspec

refs diaspora/diaspora#4732
refs diaspora/diaspora#4710
refs diaspora/diaspora#4711
refs diaspora/diaspora#4517
2014-05-15 07:23:43 -04:00
Jannik Streek
8a4f833d1d added more tests for the poll federation + fixed broken rspec tests 2014-03-31 18:14:06 +02:00
Jannik Streek
fe67bdf2e7 added tests for poll federation and impl for the federation itself. Still in progess 2014-03-31 18:14:06 +02:00
Jannik Streek
dfbe17d046 Poll input fields and data model now available
question field of poll now in db

fixed merge issues
2014-03-31 18:14:06 +02:00
Jason Robinson
5fe5507128 Add devise_lastseenable for user last seen tracking.
Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734
2014-02-22 23:22:46 +02:00
Jonne Haß
9ea6e9c166 Merge pull request #4517 from Zauberstuhl/report_post_feature
Added post reporter feature

Conflicts:
	Changelog.md
	app/assets/stylesheets/application.css.sass
	db/schema.rb
2014-01-20 10:03:45 +01:00
Lukas Matt
5c9a3aaf3e Added post report feature
You can report a single post by clicking the correct icon in the controler section

Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
2014-01-14 15:00:55 -05:00
Jason Robinson
db71c9c50b Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$ 2014-01-06 22:00:53 +02:00
maruf
c17a474142 Simple captcha for signup page 2014-01-06 22:00:37 +02:00
Jonne Haß
1ab14ef368 Merge pull request #4337 from oliverbarnes/4312-index-key-too-long
Limit index key length when creating oembed caches

Conflicts:
	db/schema.rb
2013-08-06 20:52:37 +02:00
Oliver Azevedo Barnes
2fc5a78c50 Add schema changes to migration fix 2013-08-05 13:41:59 -05: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
Oliver Azevedo Barnes
7f4bc5550d Limit index key length when creating oembed caches 2013-07-31 14:42:49 -05:00
Jonne Haß
7057f77924 fix ActivityStreams::Photo migration 2013-07-31 20:57:01 +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ß
e286531687 remove restriction on guid length 2013-06-28 08:10:57 +02:00
Jonne Haß
b8db623aa4 update reference to postgres? in the migrations too 2013-06-12 16:44:19 +02:00
Ruxton
a8655e2e8d Add tweet_id column to post 2013-05-20 11:00:00 +08: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
embs
16cf699d4b Fix default image url in profiles table. Closes #3795 2013-04-04 19:22:43 -03: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
L3MNcakes
1120cba5f0 Issue #3939: Posts to Facebook do not delete 2013-02-18 18:21:59 +00:00
Fabián Rodríguez
ebd9f87e61 fix db/seeds.rb 2012-10-03 20:39:35 -03:00
Jonne Haß
8279eb2262 update root migration so that later migrations do not fail 2012-09-14 15:24:53 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +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
Sean Tilley
49ea8c8563 Strip Beta Features 2012-09-11 21:52:53 -05:00
Maxwell Salzberg
4c9326eaf9 fix stupid sign up form 2012-08-21 15:42:07 -07:00
Florian Staudacher
8f1204d05a first working version of a 'post fetcher' for remote accounts 2012-08-04 13:22:03 +02:00
Maxwell Salzberg
c2bbe4e466 somehow some dirty state made it into my merge :( 2012-07-02 11:34:31 -07:00
Maxwell Salzberg
190fceaf5c [SECURITY FIX] please update your pod ASAP
This is a fix for public messages, where a malicious pod could spoof a message from someone a user was connected to, as the verified signatures were not checked that the object was also from said sender.  This hole only affected public messages, and the private part of code had the correct checks
THX to s-f-s(Stephan Schulz) for reporting and tracking down this issue, and props to Raven24(florian.staudacher@gmx.at) for helping me test the patch
2012-07-02 10:00:12 -07:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
2012-06-11 03:13:20 -07:00
Maxwell Salzberg
78809798ad update schema, also made bob and admin in the seeds [ci skip] 2012-05-22 11:24:36 -07:00
danielgrippi
777c037e16 kill rich-media type with fire 2012-05-21 12:33:28 -07:00
danielgrippi
f4c06c8f88 add rounded buttons to the composer flow; slay multi-photo option 2012-05-18 19:46:51 -07:00
danielgrippi
27aff7fb1e DG DC; GREEEEEEEEEN 2012-05-17 17:01:31 -07:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Dennis Collinson
68439ebab3 fix service user migration 2012-05-14 18:36:25 -07:00
Maxwell Salzberg
06f389231a kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk 2012-05-14 16:25:19 -07:00
danielgrippi
56913ffb80 upload wallpaper for great success. 2012-05-06 12:35:11 -07:00
Maxwell Salzberg
592a3f99b5 Role system to replace the yml admins and community spotlight. we can
also now add a beta role
2012-04-27 16:14:43 -07:00
Jonne Haß
c9406d8d7e fix favorite migration for postgres, thanks [JT] [ci skip] 2012-04-23 18:43:23 +02:00
danielgrippi
75d25e9475 users can now favorite posts 2012-04-22 12:06:15 -07:00
Maxwell Salzberg
1b2440f68a we now store image height and width locally; still need to federate the values 2012-04-20 12:22:12 -07:00
Maxwell Salzberg
9f6ad65d73 update schema, views spec 2012-04-13 18:32:35 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Maxwell Salzberg
a5b53717ea small typo fixes, in heroku and seed scripts [ci skip] 2012-04-03 15:02:10 -07:00
Christophe
4279d85776 New index for posts table. interacted_at still missing 2012-04-01 19:16:04 -07:00
Christophe
48571cae37 Indexes on participation table 2012-04-01 19:16:04 -07:00
Maxwell Salzberg
302346bcdb Merge pull request #3089 from justindthomas/fix-migration
change concat() to || for pgSQL
2012-03-31 09:27:53 -07:00
Maxwell Salzberg
98b41d8f1d update seeds.rb to reflect asset pipeline, and a lil bit of refactoring 2012-03-31 00:15:56 -04:00
Justin Thomas
14a0e9c586 change concat() to || for pgSQL 2012-03-30 11:45:50 -07:00
Benjamin Neff
48392e717b migration for old invitation-emails 2012-03-28 03:27:56 +02:00
Dennis Collinson
775eca0026 MS DC You can has choose a template 2012-03-27 14:52:53 -07:00
Maxwell Salzberg
319b3c4d3b fixed rspec tests, more fit and finish around how the invite code works,
and improving admin functionality
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
ba88ce6be4 update db/schema 2012-03-13 16:17:39 -07:00
Diaspora Europe
41c3698ebf remove unused youtube_titles from comments and posts 2012-03-01 15:37:20 +01:00
Dennis Collinson
9e1816dc12 Participations are a federated, relayable model :) 2012-02-09 19:01:00 -08:00
Dennis Collinson
558ceec92a a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00
Sarah Mei
d1fbf7b55c Fix migration for MySQL 2012-02-03 21:12:44 -08:00
Ricardo
6fa548e427 fix syntax for psql backend
- PostgreSQL doesn't allow double quotes for values. Double quotes are
  used for surrounding table names that contain spaces. Single quotes
  should be used for values.

- DELETE in a JOIN is not permitted in SQL-99 (see
  http://drupal.org/node/555562) so we use USING with WHERE instead
2012-02-04 12:45:13 +08:00
Dennis Collinson
3991903b56 MS DG DC Participate stream that has things bubble to the top 2012-02-03 17:23:57 -08:00
Maxwell Salzberg
2ea0ca0e9b never use AR classes in migrations if you can help it 2012-02-02 14:25:33 -08:00
Maxwell Salzberg
b55cadb4a4 today is not my day. fix comment in migration 2012-02-02 14:06:40 -08:00
Maxwell Salzberg
fe4b886649 this should work, and added a bit of logging 2012-02-02 14:05:29 -08:00
Maxwell Salzberg
da1345502f possible fix for migration, hang tight before running it 2012-02-02 13:54:39 -08:00
Dennis Collinson
8a61718efd migration iterates through shareables 2012-02-02 13:37:43 -08:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
Dennis Collinson
d1a82d288d moar verbose comment [ci skip] 2012-02-02 11:50:00 -08:00
danielgrippi
7bd6a450a0 remove public share visibilities. NOTE: you should run optimize table as detailed in the migration's comments after executing this. [ci skip] 2012-02-02 11:43:37 -08:00
Sarah Mei
b9ae426015 db/schema.rb now includes an encoding line in ruby 1.9.2 2012-01-27 21:55:59 -08:00
Sarah Mei
19df6e1f59 Make rake db:rebuild work under ruby 1.9.2 2012-01-27 21:55:07 -08:00
Maxwell Salzberg
254860bddc SM MS; Read email sent to diaspora-dev for more information about this
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
2012-01-17 19:29:01 -08:00
danielgrippi
91e3f5f6ff remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models 2012-01-14 15:40:43 -08:00
Daniel Grippi
643209112b Merge pull request #2526 from Pistos/postgresql-drop-table
Fix from-scratch migration on PostgreSQL with a non-root DB user
2012-01-04 16:14:34 -08:00
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature""
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
2012-01-04 13:49:56 +01:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
Pistos
5110b4c086 Added MySQL-friendly version of SQL code for migration. 2011-12-19 17:12:17 -05:00
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
danielgrippi
97b8045f20 added counter cache for photos on StatusMessage 2011-12-16 20:39:24 -08:00
Pistos
57369af7a1 drop_table (with later versions of Rails?) doesn't work with PostgreSQL with a non-root DB user.
You get problems like:

  ERROR:  permission denied: "RI_ConstraintTrigger_506060" is a system trigger

This change is necessary or else nobody will be able to install Diaspora with PostgreSQL.
2011-12-12 22:55:21 -05:00
Jonne Hass
247863c6f7 update diaspora-client 2011-12-10 12:54:39 +01:00
Jonne Hass
4dd55ebdad fix diaspora connect for the new oauth stuff WIP. There's one bug where the oauth_identifier changes but the client doesn't get informed or doesn't save it. I hope it's the last bug. Btw. this is all ugly 2011-12-10 12:54:39 +01:00
Ilya Zhitomirskiy
0bd101dca9 change close account to clear profile, still need to dispatch account deletion xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
7667029e71 wip, stated the serialized model 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
3035f173bd ms iz wip, clearing profile, started deleting post visibilities 2011-12-08 16:32:18 -08:00
Daniel Grippi
cec1f09202 specs green 2011-11-30 09:56:47 -08:00
danielgrippi
6408105917 Revert "auto follow back feature"
This reverts commit 226554becf.

Conflicts:

	config/locales/diaspora/en.yml
2011-11-14 17:18:43 -08:00
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Sarah Mei
92c28857b3 Refactor and backfill tags_following_controller_spec. Move normalize tag specs into model spec. Move rss fixture file into fixture directory. 2011-11-05 16:05:13 -07:00
danielgrippi
ae7944418c DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams 2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9 wip 2011-11-03 12:31:24 -07:00
Ilya Zhitomirskiy
8713c58860 updated schema 2011-10-31 15:19:02 -07:00
Lennart Prelle
f2123d942d make language for email-invitation available 2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
3b1f3f90d1 removing duplicate tag followings 2011-10-26 14:24:35 -07:00
Ilya Zhitomirskiy
162d3ccd10 added the missing tag followings indecies 2011-10-26 13:40:01 -07:00