Jonne Haß
c8f990359d
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-21 20:50:27 +02:00
Steffen van Bergerem
a14713b985
Update markdown-it, disable fuzzy links
2015-04-21 20:50:16 +02:00
Jonne Haß
37ec00f80b
Merge pull request #5854 from svbergerem/remove-managing-services-standalone
...
Remove 'manage services' link in standalone mode
2015-04-20 22:36:11 +02:00
Jonne Haß
d959dd725b
Merge pull request #5850 from svbergerem/modal-for-new-aspect
...
Use Bootstrap modal for new aspect form
2015-04-20 22:34:51 +02:00
Marcelo Briones
6636a89118
Add participation counter
2015-04-11 14:41:17 -03:00
Steffen van Bergerem
b885b8583d
Remove 'manage services' link in standalone mode
2015-04-08 12:49:05 +02:00
Steffen van Bergerem
75ef9f47d0
Use Bootstrap modal for new aspect form
2015-04-07 10:45:09 +02:00
Steffen van Bergerem
a6b9c6c057
Return 406 on people/guid/contacts, format json
2015-04-04 03:48:44 +02:00
Jonne Haß
4b841ef076
Merge pull request #5843 from margori/private_post_subject_content
...
Limited post content excluded from subject of comment email
2015-04-04 00:39:40 +02:00
Marcelo Briones
aa6b590b3c
Limited post content excluded from subject of comment email
2015-04-03 16:37:17 -03:00
Steffen van Bergerem
07a344d051
Disable auto follow back on aspect deletion
2015-04-03 14:10:14 +02:00
Steffen van Bergerem
1701bc30d0
Don't add mentions and reshares to all streams
2015-04-01 16:51:08 +02:00
Jonne Haß
548b0d8161
Rescue correct constant in Workers::ReceiveLocalBatch
...
Fixes #5834
2015-04-01 04:01:40 +02:00
Steffen van Bergerem
adf9bcf8e8
Update markdown-it
2015-03-26 00:07:25 +01:00
Jonne Haß
65a738e604
bump rspec-rails
2015-03-25 02:33:56 +01:00
Jonne Haß
61461db913
fix jasmine spec for correct reshare behavior
2015-03-24 17:20:33 +01:00
Jonne Haß
73b6c75278
On reshare insert the reshare built from the response
...
Also make sure comments_count and the like is always set in the
response.
2015-03-23 23:02:23 +01:00
Jonne Haß
644fc46dee
Merge pull request #5792 from MothOnMars/4020-role-specs
...
added specs and validations for Role model
2015-03-20 01:54:04 +01:00
Steffen van Bergerem
d9bf4a2fa6
Remove layout 'centered_with_header_with_footer'
2015-03-18 21:59:56 +01:00
Martha
d4f1a5dbe8
added specs and validations for Role model
...
- added shoulda-matchers gem for one-line specs
- added FactoryGirl syntax methods
2015-03-18 09:16:15 -07:00
Steffen van Bergerem
a161e4d3a7
Uncomment jasmine tests
2015-03-18 00:01:22 +01:00
Jonne Haß
256d7862b9
Merge pull request #5782 from svbergerem/reshared-poll
...
Display reshared poll
2015-03-15 20:45:51 +01:00
Jonne Haß
5ea90016b3
Merge pull request #5783 from visualsayed/5737-too-long-tag-name
...
5737 too long tag name
2015-03-15 18:06:53 +01:00
Steffen van Bergerem
81cd1753e4
Improve link to original post in reshared polls
2015-03-15 17:07:16 +01:00
Hincu Petru
9589cb2e0f
disable poll voting for reshared post
2015-03-15 16:46:48 +01:00
Sayed
18a1958ef8
fix too long tag name #5737
2015-03-15 16:15:33 +02:00
Augier
322ee30005
Tests with Jasmine
2015-03-15 14:52:49 +01:00
Augier
f4534ec412
Refactor notification badge view (again)
2015-03-15 11:48:06 +01:00
Augier
673661b798
Ported searchbar
2015-03-15 11:48:06 +01:00
Augier
2a9fddf7a0
Port notifications to backbone part. 2
2015-03-15 11:48:06 +01:00
Steffen van Bergerem
2328f64d56
Merge pull request #5580 from MothOnMars/5549-password-reset-error
...
display specific error messages for password change (issue #5549 )
2015-03-14 03:25:08 +01:00
Martha
985141c0e8
display specific error messages for password change (issue #5549 )
2015-03-13 11:35:21 -07:00
Steffen van Bergerem
1ff644c13e
Fix mobile notifications
2015-03-12 22:45:04 +01:00
Steffen van Bergerem
52c2a73d83
Merge pull request #5707 from AugierLe42e/port-notifications-backbone
...
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
2015-03-11 17:05:14 +01:00
Steffen van Bergerem
f5bf53a004
Refactor vendor javascript
2015-03-11 15:51:08 +01:00
Augier
95f4675ddf
Port of notifications to Backbone
2015-03-11 02:11:05 +01:00
Jonne Haß
8ab6f31e0a
Merge pull request #5751 from svbergerem/fix-photo-count-profile
...
Fix photo count in the profile view
2015-03-10 17:45:12 +01:00
Steffen van Bergerem
d2222a97e5
Fix photo count in the profile view
2015-03-10 11:38:49 +01:00
Steffen van Bergerem
1b2b10877a
Fix services char counter
2015-03-09 21:18:10 +01:00
Steffen van Bergerem
73d04b706e
Use entypo icons for left navbar
2015-03-09 17:57:50 +01:00
Steffen van Bergerem
3298373a7f
Add missing http:// to urls
2015-03-09 01:42:40 +01:00
Jonne Haß
f525f9e34d
Merge pull request #5730 from Flaburgan/strip-markdown-from-title
...
Strip markdown from the heading of a post
2015-03-06 23:43:13 +01:00
Steffen van Bergerem
2a52f65160
Bump markdown-it
2015-03-06 20:40:06 +01:00
flaburgan
5dc8642a99
Strip markdown from the heading of a post. Impact notifications, email subjects, SPV <title>, the Atom feed...
2015-03-04 19:30:00 +01:00
Marcelo Briones
b154d87070
Exports user photos as zip file
2015-03-03 19:45:57 -03:00
Jonne Haß
dd45b79a98
Drop Youtube oembed HTTPS hack
...
upstream ships it now that way
2015-03-02 02:34:51 +01:00
Steffen van Bergerem
e188782a9a
Remove blueprint code
2015-03-02 00:04:57 +01:00
Steffen van Bergerem
c838389b67
Fix invitations and tests
2015-03-02 00:04:56 +01:00
Jonne Haß
987281270a
bump ruby-oembed
2015-02-28 02:36:13 +01:00
Jonne Haß
678033fa23
replace deprecated stub syntax in export user spec
2015-02-27 17:00:42 +01:00
Jonne Haß
7a741c6dce
Ensure deliveries are cleared after each example
2015-02-27 17:00:41 +01:00
Jonne Haß
3a90386303
deliver needs to be called on the return value of the mailer call
2015-02-27 16:58:39 +01:00
Jonne Haß
d295b5d5b5
ActiveRecord::Base::reflection returns strings now
2015-02-27 16:58:39 +01:00
Jonne Haß
9530f00bd6
Don't use a too large invalid id
2015-02-27 16:58:39 +01:00
Jonne Haß
1ec3f5caa6
Don't pass a model instance where an id is expected
2015-02-27 16:58:39 +01:00
Jonne Haß
290aded7f6
ActionMailer deliver -> deliver_now
2015-02-27 16:58:39 +01:00
Jonne Haß
ed44689670
Fix a spec for LikesController
2015-02-27 16:36:45 +01:00
Jonne Haß
99ea156e1c
Refactor User.total_users into a scope
2015-02-27 16:30:51 +01:00
Jonne Haß
6432bbe67b
fix
2015-02-27 16:29:49 +01:00
Jonne Haß
93c9ad6eba
Fix participations controller spec
2015-02-27 16:27:55 +01:00
Jonne Haß
95053ccbf2
Merge pull request #5351 from MarcBurt/5041-Total-user-statistic-shouldnt-include-closed-accounts
...
5041 total user statistic shouldnt include closed accounts
2015-02-27 16:02:35 +01:00
Jonne Haß
be1ab6c6a3
Merge branch 'collimarco-issue5350' into develop
2015-02-27 15:33:55 +01:00
Augier
168adae009
Adding help section for chat
2015-02-26 18:06:39 +01:00
PIOTR KLOSINSKI
b8be76be3c
changed reshare function, so it adds the object to the stream
...
tests for reshares
Changelog.md update
fixing a style issue
removed unnecessary semicolon
2015-02-23 15:44:31 +01:00
zachrab
f695b5d3e7
Set disable_mail to true
...
Add #clear_account! disable mail spec
Add migration for disabling mail for all closed accounts
Change migration to use #update_all for disable_mail attribute
Add #clear_account! false fields spec
2015-02-19 16:45:39 -08:00
Akash Agrawall
3bb5e78893
Lock account #5564
2015-02-19 05:45:04 +05:30
Jonne Haß
6a5a407e49
Strip Unicode format characters prior post processing
2015-02-17 23:29:05 +01:00
Steffen van Bergerem
eb7e2eac9d
Update jasmine-ajax
2015-02-17 04:03:42 +01:00
Steffen van Bergerem
9c22ed6aef
Add year to notifications page
2015-02-16 18:02:50 +01:00
Steffen van Bergerem
9373d5bd20
Fix jasmine tests for new help routes
2015-02-14 19:38:00 +01:00
Augier
aa62266376
Added routing system to open a section in help
2015-02-14 18:05:40 +01:00
Jonne Haß
84cfaa1cfb
Merge pull request #5659 from Zauberstuhl/link_to_remote_profile
...
Add the ability to link remote user profiles
2015-02-13 20:35:14 +01:00
Lukas Matt
a475d5fb62
Add the ability to link to remote user profile
...
related to diaspora/jsxc#77
2015-02-13 19:23:26 +01:00
Jonne Haß
b910adc52b
Merge pull request #5663 from svbergerem/pending-specs
...
Green pending specs for evil query spec tag stream
2015-02-13 13:46:08 +01:00
Steffen van Bergerem
55cb2dd30a
Green pending specs for evil query spec tag stream
2015-02-13 12:30:53 +01:00
Steffen van Bergerem
d09e8a3758
Bump markdown-it-sanitizer
2015-02-13 02:58:31 +01:00
Jonne Haß
3c58cbeaee
Merge pull request #5646 from svbergerem/fix-conversation-scrolling
...
Conversations: fix badge count and automatic scrolling
2015-02-11 14:19:48 +01:00
Steffen van Bergerem
7112cb112b
Add hovercards for mentions
2015-02-11 00:46:00 +01:00
Steffen van Bergerem
8962d75eb7
Conversations: fix badge count and automatic scrolling
2015-02-10 19:11:20 +01:00
Steffen van Bergerem
3312f97981
Fix timeago for notifications, add 'no notifications yet' message
2015-02-09 03:56:37 +01:00
Steffen van Bergerem
2ec093a54c
JSHint boss, evil, loopfunc and scripturl
2015-02-08 23:41:33 +01:00
Steffen van Bergerem
ab6732cac1
JSHint eqeqeq
2015-02-08 23:41:32 +01:00
Steffen van Bergerem
5fa6b8253e
JSHint unused and undefined variables
2015-02-08 23:41:32 +01:00
Steffen van Bergerem
a9a480da0a
JSHint semicolon errors
2015-02-08 23:41:31 +01:00
Steffen van Bergerem
6b0a5823e3
Add JSHint javascript linter
2015-02-08 23:41:31 +01:00
Marc Burt
9f5131b6ec
Fixed #5041 with new User method to find total accounts excluding closed and invitations
2015-02-08 13:49:12 +00:00
Steffen van Bergerem
c1d714d2c7
Remove unused files, fix syntax in jasmine tests
2015-02-07 21:17:51 +01:00
Steffen van Bergerem
8b33b9eb18
Merge pull request #5602 from Faldrian/more-shortcuts
...
Add shortcuts for reshare, expand Post and open first link in a post
Conflicts:
config/locales/diaspora/en.yml
2015-02-07 14:41:56 +01:00
Sam Radhakrishnan
a12c0d83c0
Fixed Bug #5593 . Added length validation to location in profile model with maximum length 255.
2015-02-02 19:42:53 +05:30
goobertron
42cd2337be
Amend all text strings in en locales to use sentence case
...
Adapt cukes to work with new capitalisation rules
2015-01-31 17:44:57 +00:00
Augier
55d258c5ac
Fix registrations displaying
2015-01-30 18:00:22 +01:00
Faldrian
099974ddef
Add shortcuts for reshare, expand Post and open first link in a post
2015-01-28 16:19:18 +01:00
Marco Colli
eccab62e32
Allow user to enable / disable notifications for a post from stream #5350
2015-01-25 18:40:47 +01:00
Sakshi Jain
8b1f0453a1
5560 Hide community spotlight setting if not enabled
2015-01-20 10:31:31 +05:30
Jonne Haß
6502000429
Merge pull request #5574 from svbergerem/fix-linkify
...
Fix markdown-it linkify blocking Firefox
2015-01-19 15:02:00 +01:00
Steffen van Bergerem
b63d8fc679
Fix markdown-it linkify blocking Firefox
2015-01-19 02:09:10 +01:00
Marcelo Briones
63eca447d0
Strip EXIF data as user preference
2015-01-18 10:28:28 -03:00
Jason Robinson
6513053586
Merge pull request #5499 from gdpelican/feature/json-exporter-deux
...
JSON Exporter, part deux
2015-01-17 00:51:38 +02:00
James Kiesel
1c69dd7752
Add contacts/posts, and GZipping JSON exporter output
2015-01-15 00:20:19 +13:00
Steffen van Bergerem
61c17c7896
Add more markdown-it plugins
...
activate sanitizer, sub and sup
2015-01-13 03:41:06 +01:00
Steffen van Bergerem
d692e6df7d
Bump markdown-it to 3.0.3, markdown-it-hashtag to 0.2.2 and markdown-it-diaspora-mention to 0.1.2
2015-01-11 02:54:30 +01:00
flaburgan
46223a2dfc
Don't truncate notification emails anymore, close #4342
2015-01-10 22:10:11 +01:00
Steffen van Bergerem
026773194a
Replace pagedown by markdown-it
2015-01-10 18:56:20 +01:00
Jonne Haß
9c99ae357a
Merge pull request #5493 from collimarco/solved5341
2015-01-06 14:43:58 +01:00
Jonne Haß
f20020f06b
Merge pull request #5473 from svbergerem/contacts-backbonejs
...
Port contacts page to backbonejs
2015-01-06 14:38:55 +01:00
Jonne Haß
3f49bc52f4
Merge pull request #5468 from Flaburgan/add-followed-tags-to-mobile-menu
...
Add followed tags to the mobile menu
Conflicts:
Changelog.md
2015-01-06 14:35:37 +01:00
Steffen van Bergerem
99fd5712b2
Fix jasmine specs
...
toBeTruethy and toBeFalsy don't test anything
use toBeTruthy() and toBeFalsy() instead
2015-01-04 17:13:18 +01:00
Steffen van Bergerem
9de6a26a22
Port contacts page to backbonejs
2015-01-04 17:13:18 +01:00
François Lamontagne
4c33a6adeb
Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273 )
2015-01-03 13:25:16 -05:00
Marcelo Briones
fe6052865c
Remove limited content from email notifications
2014-12-28 22:15:47 -03:00
flaburgan
3ff298606f
Add menu mobile and drawer navigation tests
2014-12-28 18:49:03 +01:00
Jonne Haß
45b385d694
Handle reshares of deleted posts in OpenGraph tags generation code
2014-12-27 15:07:16 +01:00
Marco Colli
f775d74cfd
Add failing test
2014-12-24 11:49:35 +01:00
Marco Colli
76cc5e2d5c
Add ActiveRecord::RecordNotFound catching. Add tests.
2014-12-22 12:36:09 +01:00
margori
27a1886834
Changes delete conversation button tooltip to 'hide' or 'delete'
2014-12-19 18:26:43 -03:00
Jonne Haß
6806b2daf8
Merge pull request #5354 from gdpelican/feature/json-exporter
...
Feature/json exporter
2014-12-17 16:45:25 +01:00
margori
e6c605d92b
Destroy conversation when all participants leave it
2014-12-17 11:33:23 -03:00
James Kiesel
e174514d69
Add JSON exporter for user profile download
2014-12-16 08:55:35 +13:00
Marcelo Briones
4e83e4c7ed
BUG: new messages to person that is not sharing
...
Conversation recipient validated
- Conversation foreign recipient not required to be validated.
- Added 'peter' as spec_helper user.
- New fixture, new statistic values.
- Clearer identifier names
2014-12-10 17:02:20 -03:00
Jonne Haß
f4c756cd34
use URI.join in the specs too
2014-12-09 17:27:27 +01:00
Dennis Schubert
cc0c19b482
Merge pull request #5462 from jhass/open_graph_reader
...
Bye opengraph_parser, hi open_graph_reader
2014-12-09 04:42:20 +01:00
Jonne Haß
3a92efbfaf
drop deferred garbage collection
2014-12-08 04:51:06 +01:00
Jonne Haß
74a6f42501
Bye opengraph_parser, hi open_graph_reader
...
opengraph_parser is basically unmainted, issues are ignored
or deliberately closed without fixing. It pollutes the global
namespace and has no verification of correctness.
The opengraph gem has basically the same issues, not really maintained,
unreleased patches on master since over a year, not really smart either.
So I created my own version and while at it, why not strive try to be
complete and robust, although it's still a work in progress.
This also improves general URL detection by parsing them
from the message after stripping markdown.
An additional dependency was added to support
fetching sites that require cookies to work at all.
For the same reason Faraday's default redirect limit was
bumped.
2014-12-08 02:01:31 +01:00
Steffen van Bergerem
8a50db76b1
Only show aspect chat control if chat is enabled
2014-12-05 13:07:17 +01:00
Jonne Haß
63e9d7b73f
Update aspect list checkmarks only after the stream was fetched
2014-12-05 03:18:30 +01:00
Jonne Haß
9d5e1f604d
Make app.helpers.truncate tolerant to null and undefined
2014-12-04 16:45:00 +01:00
Dennis Schubert
339111867e
Merge pull request #5443 from jhass/spring
...
Replace spork with spring, update & use binstubs
2014-12-04 00:38:30 +01:00
Steffen van Bergerem
4c655d8c8b
Speed up notifications controller spec
2014-12-02 02:43:01 +01:00
Jonne Haß
a580171e32
Replace spork with spring, update & use binstubs
...
Spring is the recommended application preloader for rails
2014-12-01 08:06:07 +01:00
Jonne Haß
d22f59d6bd
Merge pull request #5447 from svbergerem/try-to-improve-notifications-spec
...
Try to improve the notifications controller spec
2014-12-01 08:02:38 +01:00
Steffen van Bergerem
7b17b78de7
Try to improve the notifications controller spec
2014-12-01 02:27:19 +01:00
Jonne Haß
5af0b1cbdd
don't use 666 as non-existant ID in report model spec
2014-11-30 21:56:27 +01:00
Faldrian
29f55f42b6
truncate long opengraph description to 250 chars in mobile and stream view
2014-11-29 17:18:01 +01:00
Steffen van Bergerem
55b60f7bde
Remove unused files in lib
2014-11-22 21:21:38 +01:00
Lukas Matt
2712b413c3
Fixed privilege spec; use correct container for trigger event
2014-11-13 12:28:45 +01:00
Lukas Matt
bb18c8e028
Test chat privilege option; should replace text/icon on trigger
2014-11-13 11:49:03 +01:00
Lukas Matt
32dcf8cabb
Test jsxc helper spec; should respond with correct url
2014-11-13 11:43:56 +01:00
Lukas Matt
46097ba8c8
Test token authentication; should allow it
2014-11-13 11:42:24 +01:00
Dennis Schubert
aec00f834f
Add Camo for <img>-tags inside Markdown contents
2014-11-10 02:19:45 +01:00
Jonne Haß
4be6dc208f
update maintenance mailer spec for new mail text
2014-11-09 19:47:37 +01:00
Dennis Schubert
6808150920
Method calling convention and doc improvements
...
... and a stealth-commit of an already introduced bug prevention system.
;)
2014-11-09 07:20:30 -08:00
Dennis Schubert
a4a63c4c85
A little bit of cleanup
2014-11-09 02:27:17 +01:00
Dennis Schubert
cca0c9eec4
Some refactorings, safer regex
2014-11-08 23:12:45 +01:00
Steffen van Bergerem
25e4e558c5
Ask for confirmation when leaving a submittable publisher
2014-11-02 01:49:33 +01:00
Jonne Haß
f361a0f885
Merge pull request #5288 from jaywink/remove-old-users
...
Maintenance feature to remove old users, scheduled in settings
2014-10-17 01:00:51 +02:00
Augier
2ce98b49d7
Fix issue #4416
...
Conflicts:
spec/helpers/notifier_helper_spec.rb
2014-10-16 23:27:48 +02:00
Jason Robinson
69c3566958
Maintenance feature to remove old users
...
Add Sidetiq webview to the Sidekiq monitoring panel
Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq
Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.
Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
2014-10-16 22:53:08 +03:00
Jonne Haß
7313bafe86
update notifier helper spec expecatations to redcarpet 3.2
2014-10-15 01:00:27 +02:00
Jonne Haß
f532efeac5
Merge pull request #5276 from svbergerem/reshare-absolute-root
...
Reshare the absolute root of a post
Conflicts:
Changelog.md
2014-10-14 19:40:35 +02:00
Jonne Haß
e892b115ac
Merge pull request #5289 from svbergerem/convert-cukes-tags
...
Convert some cukes to rspec tests
2014-10-14 13:26:53 +02:00
