Steffen van Bergerem
31bbfe8eab
Merge pull request #5887 from szlend/5874-fix-bold-links
...
Issue #5874 Fix styled links
2015-04-30 11:05:24 +02:00
Simon Žlender
f5ce612299
Issue #5874 Fix styled links
2015-04-25 16:51:11 +02:00
Martin Artnik
283f22fc84
Fix unconventional image asset inclusion in css asset
2015-04-25 16:18:27 +02:00
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
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
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
Steffen van Bergerem
7648b58c15
Merge pull request #5875 from SuperTux88/add-mumble-protocol
...
add mumble protocol to linkify
2015-04-21 22:17:43 +02:00
Jonne Haß
61c890f274
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-21 22:02:28 +02:00
Steffen van Bergerem
6bb5e0a29b
Only render hovercard if the mouse is still on the username
2015-04-21 22:02:18 +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ß
9a9cf6f6a5
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-21 20:48:41 +02:00
Steffen van Bergerem
2d3c0680ea
Fix uppercase registration/login labels and btn style
2015-04-21 20:48:30 +02:00
Jonne Haß
9d4916709b
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-20 22:40:12 +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
Benjamin Neff
128cfb247c
fix not_public page
...
body was rendered in the head
2015-04-20 22:32:32 +02:00
Jonne Haß
e996bd7e36
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-20 21:49:55 +02:00
Jonne Haß
6fe06f6d3c
Merge pull request #5868 from SuperTux88/fix-service-icons
...
fixed service-icons in sidebar
2015-04-20 21:49:46 +02:00
Benjamin Neff
13a6b1389d
fixed service-icons in sidebar
...
recovered css from old application.scss
was removed in e188782a9a
2015-04-20 21:49:36 +02:00
Jonne Haß
a06448447a
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-20 21:19:49 +02:00
Benjamin Neff
0211da4116
fix control icon alignment in chromium browser
2015-04-20 21:06:17 +02:00
Jonne Haß
85c376e591
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-19 15:58:41 +02:00
goobertron
a75ec75ec7
Update aspect edits text, reorder posting section
...
First iteration to update Help section
Changes from Fla
2015-04-19 15:57:21 +02:00
Marcelo Briones
6636a89118
Add participation counter
2015-04-11 14:41:17 -03:00
Asphyxia
5fb328864e
Activity stream keeping retracted participations
2015-04-10 21:46:42 -03:00
Jonne Haß
5481ddb540
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-10 19:23:00 +02:00
Jonne Haß
ec2a209b68
Lazily initialize Contact proxy in service helper
...
This prevents connecting to the database on rake assets:precompile,
which fails in certain build environments.
Running git blame on this and figuring out what in gods name this
is for, is for another time.
2015-04-10 19:19:16 +02:00
Steffen van Bergerem
895d38de21
Refactor available services settings
2015-04-08 18:43:35 +02: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
Jonne Haß
bec2508545
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-03 02:21:59 +02:00
Steffen van Bergerem
3e5eb350ae
Notification dropdown: 'mark all as read' link scroll fix
2015-04-03 02:21:06 +02:00
Jonne Haß
0155d8972a
Merge pull request #5839 from svbergerem/use-test-instead-of-match
...
Use test instead of match wherever possible
2015-04-01 23:54:42 +02:00
Steffen van Bergerem
f8707e0e1a
Use test instead of match wherever possible
2015-04-01 18:35:20 +02:00
Jonne Haß
099bb01005
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-01 18:28:08 +02:00
Jonne Haß
2dd4bf0acf
Merge pull request #5838 from svbergerem/check-stream-before-adding-posts
...
Don't add mentions and reshares to all streams
2015-04-01 18:27:06 +02:00
Steffen van Bergerem
1701bc30d0
Don't add mentions and reshares to all streams
2015-04-01 16:51:08 +02:00
SansPseudoFix
5b90e1a060
Fix tag overflow mobile page
...
modified: app/assets/stylesheets/mobile/mobile.scss
modified: app/assets/stylesheets/mobile/mobile.scss
2015-04-01 14:55:45 +02:00
Steffen van Bergerem
6b024dcd45
Fix missing button styles in donate and admin sections
2015-04-01 13:34:56 +02:00
