Commit graph

2176 commits

Author SHA1 Message Date
Jonne Haß
619bc3f537 A reshares root may be already gone when generating the notification 2014-09-07 10:47:47 +02:00
Jonne Haß
777e3123d6 Try fetching missing parent of relayables
* Extract post fetching logic from Reshare into
  its own module
* raise proper error message when fetching fails
* raise proper error message when parent is still missing

We can't skip fetch failures or missing parents and
still need to retry them in case we're sent the parent
later on
2014-09-07 10:47:47 +02:00
Jonne Haß
01e0127287 Ignore embedded photos if invalid
For example if they're already present
Also refactor StatusMessage XML specs
2014-09-06 04:52:18 +02:00
Jonne Haß
462198799b Dynamic asset paths everywhere
* Use asset pipeline aware helpers in CSS files
* Add js_image_paths to push image asset names to the client side JS
2014-08-28 21:04:29 +02:00
Jonne Haß
f772af86a6 Merge pull request #5156 from khall/issue_5040
Fix for issue 5040
2014-08-26 01:16:41 +02:00
Jonne Haß
cb6c79a885 Merge pull request #5151 from khall/issue_5090
Fix for issue 5090
2014-08-26 01:14:45 +02:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
khall
41dc950a06 Adding scope for account_deletion to get only those that are uncompleted and then adding that scope to accounts.rake. Tested it out and it works well 2014-08-24 19:02:11 -07:00
khall
a9fd16db3e Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long. 2014-08-24 13:28:57 -07:00
Jonne Haß
13f50eeee6 do not touch the own model in an after commit hook
That just recurses endlessly, fixes #5146
2014-08-24 16:03:17 +02:00
Jonne Haß
5068be90e8 reduce cuke failures
* Bump sass-rails (without effect)
* Bump mobile-fu (without effect)
* Cosmetically fix two cukes
* Refactor Taggable#tag_strings
* Rename default.css to default.css.scss (without effect)
* Fix receiving a conversation
* Pass aspect_ids instead of a relation to User#aspects_from_ids
2014-08-23 16:47:57 +02:00
Jonne Haß
d070f19243 make rspec and jasmine pass with the new code 2014-08-23 16:47:57 +02:00
Jonne Haß
cb13d30a02 Directly query photos when doing an update_all
For some reason it doesn't correctly set the bind variables
when called through an association with non-standard
keys. Probably a Rails bug.
2014-08-23 16:38:57 +02:00
Jonne Haß
645a427798 Fix account deleter by not relying on protected_atrributes 2014-08-23 16:34:01 +02:00
Jonne Haß
dc12479070 Filter :id in User.build for now
Rails 4 seem to allow setting the id through supplied parameters
The controllers ported to strong_parameters should guard against
attacks over this vector, but I didn't want to remove the specs
that test this here
2014-08-23 16:34:01 +02:00
Jonne Haß
09f0665225 replace deprecated usages for all 2014-08-23 16:34:01 +02:00
Jonne Haß
cc8a614c29 Remove attr_accessible from OpenGraphCache 2014-08-23 16:34:01 +02:00
Jonne Haß
2f1193fa36 Fix "prepared statements" errors
See https://coderwall.com/p/45ombq
2014-08-23 16:34:00 +02:00
Jonne Haß
a9e107364a make status message controller spec pass and deprecation free 2014-08-23 16:34:00 +02:00
Jonne Haß
2cca5745c9 remove deprecated scoped 2014-08-23 16:34:00 +02:00
Jonne Haß
cb195f4d55 access connection through class 2014-08-23 16:34:00 +02:00
Jonne Haß
2f54d4f17d remove conditions on association deprecation warnings 2014-08-23 16:34:00 +02:00
Jonne Haß
89afb616cf replace deprecated scope syntax and unify it 2014-08-23 16:34:00 +02:00
Jonne Haß
33c3b38f2f replace deprecated finder and finder_options syntax 2014-08-23 16:34:00 +02:00
Jonne Haß
ec877e3784 Merge pull request #4978 from jhass/bump_acts_as_taggable_on
Bump acts-as-taggable-on
2014-08-18 12:20:19 +02:00
Jonne Haß
6fb6a08980 Merge pull request #4945 from hpetru/notifications
Refactoring Notification#notify
2014-07-01 14:33:54 +02:00
Jason Robinson
80075c13f4 Use different user.construct_public_followings_sql query depending on database backend.
This is done for performance reasons as a temporary fix for problems with 0.4.0.0 on MySQL. This madness is explained in issue https://github.com/diaspora/diaspora/issues/5014.
2014-06-24 17:07:40 +03:00
Jonne Haß
72d1ed8f7d bump acts-as-taggable-on 2014-06-01 18:42:51 +02:00
Jonne Haß
fc1f249129 Harden account deletion
* Wrap it into a transaction
* Use destroy over delete so dependent destroys get triggered
  and we thus don't fail on the foreign key constraits
* Check if a photos status message actually exists before accessing
  it
* Add missing dependent destroys
2014-05-27 00:15:15 +02:00
Jonne Haß
9537c45d2a Merge pull request #4916 from hpetru/validate-poll-answer
I added the validation to poll question and poll answer

Conflicts:
	app/assets/javascripts/app/views/publisher_view.js
2014-05-24 17:42:18 +02:00
Lukas Matt
8170ef8363 Validate on report that post or comment does exist 2014-05-16 09:48:14 -04:00
Jason Robinson
01381ddf25 Merge pull request #4957 from MrZYX/4956_deleted_reshare
Use absolute_root more consistently in Reshare
2014-05-16 10:00:31 +03:00
Lukas Matt
3d9fceb479 DB fix to work with existing entries
* added temp. default values for user_id and item_type
* changed model validation for item_type
2014-05-15 07:23:44 -04:00
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
512d96bda6 Display validation errors to user 2014-05-15 07:23:43 -04:00
Lukas Matt
6309e1a4ee Cleaned and optimized report model 2014-05-15 07:23:43 -04:00
Lukas Matt
26d0c81dae Added the ability to disable report-email-notification
Podmin can see a extra checkbox in Settings > Account
for disabling report-email-notification
2014-05-15 07:23:43 -04:00
Lukas Matt
2e36f8d375 Diaspora review part 1
* join the conditions of the inner ifs
* add a uniqueness constraint to the model
* differentiate between author is a local or a remote user
* simplify controller/mailer functions
2014-05-15 07:23:43 -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
Jonne Haß
8a599e1c1d Use absolute_root more consistently in Reshare
Closes #4956
2014-05-14 22:41:24 +02:00
Hincu Petru
7b42084cdb Refactoring method Notification#notify 2014-05-06 11:58:51 +00:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer
Introduce message renderer
2014-04-13 15:00:46 +03:00
Hincu Petru
57de031f6b I added the validation for blank to poll question and poll answer 2014-04-07 17:17:41 +00:00
Jannik Streek
095d616198 fixed federation issue due to missing delegation + test + some minor tweaks
fixed indenting

renamed test
2014-04-06 20:58:58 +02:00
goobertron
5556420740 Fix missing translation in #4905. 2014-04-05 17:06:40 +01:00
Jannik Streek
6f3844b73b fixed language files, added rails cache counter for poll answer, fixed bug with same poll input for form 2014-03-31 18:14:08 +02:00
Jannik Streek
a9843ae996 added cucumber tests, updated spec with xml class test 2014-03-31 18:14:07 +02:00
Jannik Streek
7dcf11e629 fixed federation bug due to roxml missing underscore 2014-03-31 18:14:07 +02:00
Jannik Streek
12fabe2fb9 finalized voting design + some design fixes + improved code 2014-03-31 18:14:07 +02:00
Jannik Streek
d0a77ce6b3 design for poll participation implemented, saving works as well 2014-03-31 18:14:07 +02:00