Dennis Schubert
c95dd68545
Merge pull request #5883 from SuperTux88/fix-camo-on-contacts-page
...
use camo for medium and small avatars
2015-04-25 01:26:28 +02:00
Dennis Schubert
b06a699dd6
Merge pull request #5879 from SuperTux88/encode-urls
...
encode unencoded urls and normalize IDN urls
2015-04-25 01:11:42 +02:00
Dennis Schubert
67a6c8be0c
Merge pull request #5877 from SuperTux88/fix-notification-mails
...
fix notification mails for limited posts
2015-04-25 01:09:46 +02:00
Benjamin Neff
344b198900
use camo for medium and small avatars
2015-04-24 03:10:48 +02:00
Benjamin Neff
a863f3ebb2
encode unencoded urls and normalize IDN urls
2015-04-23 00:24:53 +02:00
Jonne Haß
0bad6dba88
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-22 20:58:54 +02:00
Jonne Haß
6e546ff2bf
Trigger exports through a POST request
...
GET requests don't get any CSRF protection by Rails,
thus these sensitive actions should be better protected.
Thanks to @tomekr for the report.
2015-04-22 20:20:10 +02:00
Jonne Haß
0a70e51f74
Add a token the filename for exported user data
...
Also redirect to it for download, for Amazon S3
compatibility.
Prior to this patch an attacker could obtain an
users export by guessing the filename with a high
chance of success. Fully authenticating the
download request is a lot harder due to our diverse
deployment scenarios.
This brings the used method in line with the photo
export feature.
Thanks to @tomekr for the report.
2015-04-22 20:19:17 +02:00
Benjamin Neff
84c3814b94
fix notification mails for limited posts
2015-04-22 19:59:08 +02:00
Steffen van Bergerem
8e2103e69b
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-21 22:26:22 +02:00
Benjamin Neff
6cbb959700
add mumble protocol to linkify
...
also use double-quotes in the whole file
2015-04-21 21:16:55 +02:00
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