Commit graph

1665 commits

Author SHA1 Message Date
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ß
8de29bc28d bump faraday and faraday_middleware. closes #4950 2014-08-25 19:16:55 +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
6d3528c539 Fix for issue 5040: Adds completed_at column to account_deletions and sets timestamp upon successful completion. Depends on uniqueness of diaspora_handle when combined with person_id 2014-08-24 17:06:33 -07:00
Jonne Haß
d6d65cd0fd apply rails 4 todos and fix specs after rebase 2014-08-23 16:47:57 +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ß
0d42285496 Do not update_attributes with a nil id
Rails 4 accepts that as a parameter thus setting the id to nil
thus thinking it'd be a new record when we just want to update
it
2014-08-23 16:38:57 +02:00
Jonne Haß
ceee5baae6 raise original exception in i18n interpolation fallback middleware 2014-08-23 16:34:01 +02:00
Jonne Haß
2d57e15d5d Remove :without_protection from call in the posts fetcher and fix a couple hundreds specs as a side effect
Heisenbugs ftw.
2014-08-23 16:34:01 +02:00
Jonne Haß
7e7082a3bd Fix expectations for changes in generated HTML
Just a minor change, supplied attributes now go before the
standard ones
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ß
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ß
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ß
d75632401b make everything boot again 2014-08-23 16:34:00 +02:00
Steffen van Bergerem
9e32eb370a Remove unused js code for login page 2014-08-19 09:25:48 +02:00
Jason Robinson
d0b37fa7ee Rescue from an exception when sending emails in podmin:admin_email 2014-08-17 18:14:36 +03:00
Jason Robinson
a4eafe8a87 Allow sending emails with custom subject via Notifier.admin 2014-08-17 18:02:16 +03:00
Jason Robinson
6dd1e31337 Rake task for Notifier.admin to send emails to users 2014-08-17 18:02:16 +03:00
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +02:00
Jonne Haß
f23fb6b6cb Actually allow false as a value for sidekiq.backtrace in our Sidekiq
middleware
2014-06-13 16:04:40 +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ß
77133a4062 Merge pull request #4963 from Ruxton/feature/rake_task_to_run_account_deletion_fixes_4792
Rake task for running outstanding account deletions
2014-05-24 18:03:10 +02:00
Jonne Haß
cbd9c56a7a Merge pull request #4919 from hpetru/4776-mention-on-mobile
Unescape text before add mention, this commit solve #4776

Conflicts:
	Changelog.md
2014-05-24 17:34:29 +02:00
Jonne Haß
d36589e05b Remove hack from exporter
I couldn't reproduce what the comment states anymore, so I just removed
it. This fixes a minor issue where html wouldn't be escaped in the
export.

Thanks to A Kai (@sixhundredns) for reporting.
2014-05-24 15:27:13 +02:00
Ruxton
ba223fd3d7 Rake task for running outstanding account deletions 2014-05-19 16:05:16 +08:00
Lukas Matt
e4adb7e11b Ignore user report associations 2014-05-15 07:23:44 -04:00
Hincu Petru
e699a682f4 Unescape text before add mention, this commit solve #4776 2014-05-06 12:13:43 +00:00
Gabriel Lima
00b6a39ad5 fix bug #4832 select language for email content when invite a friend 2014-04-14 18:56:29 -03:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer
Introduce message renderer
2014-04-13 15:00:46 +03:00
Jason Robinson
6947a1945c Merge pull request #4883 from MrZYX/uuid
Use uuids for guid generation
2014-04-11 16:40:57 +03: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
Steffen van Bergerem
35b1ba088e Fix ui glitch in Bootstrap publisher 2014-03-31 22:38:45 +02:00
Jannik Streek
d0a77ce6b3 design for poll participation implemented, saving works as well 2014-03-31 18:14:07 +02: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
Hincu Petru
2be528494a Fix jquery.mentionInput.js plugin 2014-03-31 08:51:40 +00:00
Jonne Haß
98057885ac use uuids for guid generation 2014-03-30 15:38:18 +02:00
Jonne Haß
8280556a47 Introduce message renderer
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
2014-03-15 17:16:17 +01:00
Jonne Haß
bd24cb71a4 Fix plaintext mode for mentionable
Also slight refactors to it.
2014-03-09 14:02:15 +01:00
Darshan Rai
1f782dace9 Moved mentionsInput.js from vendor/assets to lib/assets
The jquery.mentionsInput plugin upstream is no longer maintained.
2014-02-10 23:19:50 +05:30
Ruxton
c8a0c81b6a Updating queries for the stream to be faster 2014-02-07 14:23:19 +08:00
Raphael Sofaer
de593f6e9f Do not retry sending out posts on SSL errors. See #4728
Refactor HydraWrapper so the when-to-retry logic is in the worker
2014-01-27 15:45:45 -08:00
Steffen van Bergerem
3d4bdfb665 Drop number of followers from tags page 2014-01-21 14:49:05 +01:00
Dennis Schubert
6fc5ccb9f9 Merge pull request #4511 from MrZYX/bump_devise
update devise to 3.2
2014-01-15 13:17:48 -08:00
Jonne Haß
15b1dae362 update devise to 3.2 2014-01-15 12:59:59 +01:00