nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15740 commits 4 branches 0 tags 121 MiB
Commit graph

15740 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Steffen van Bergerem
a14713b985 Update markdown-it, disable fuzzy links 2015-04-21 20:50:16 +02:00
Steffen van Bergerem
2d3c0680ea Fix uppercase registration/login labels and btn style 2015-04-21 20:48:30 +02:00
Jonne Haß
ae8735c2a3 Merge pull request #5870 from SuperTux88/fix-not_public-page 
fix not_public page
 2015-04-20 22:40:00 +02:00
Benjamin Neff
128cfb247c fix not_public page 
body was rendered in the head
 2015-04-20 22:32:32 +02:00
Steffen van Bergerem
fc8e92b67a Bump markdown-it 2015-04-20 22:06:00 +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ß
7ff2536369 Merge pull request #5867 from SuperTux88/align-control-icons 
fix control icon alignment in chromium browser
 2015-04-20 21:19:38 +02:00
Benjamin Neff
0211da4116 fix control icon alignment in chromium browser 2015-04-20 21:06:17 +02:00
Jonne Haß
fa7a7c5d59 Merge pull request #5865 from SuperTux88/fix-mysql_to_unicode_mb4-migration 
use "CONVERT TO" to change the encoding for the table and all character columns
 2015-04-19 16:21:35 +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
Benjamin Neff
4be8a0bed9 change TEXT columns back to TEXT 
mysql changes the type of TEXT columns to MEDIUMTEXT with "CONVERT TO",
but we don't want this, so change this columns back to TEXT.

see: https://bugs.mysql.com/bug.php?id=31291
 2015-04-19 15:45:20 +02:00
Benjamin Neff
f4fd77fa7c use "CONVERT TO" to change the encoding for the table and all character columns 
see: https://dev.mysql.com/doc/refman/5.6/en/charset-conversion.html
 2015-04-18 17:54:15 +02:00
Praveen Arimbrathodiyil
2613896cfd fix for #5862, check for compiled assets 2015-04-15 15:39:19 +02:00
goobertron
a687a8dc01 Update help text for renaming an aspect 2015-04-14 15:40:58 +02:00
Dennis Schubert
cfc98d9a2a Merge branch 'hotfix/0.4.1.3' into release/0.5.0.0-RC 2015-04-11 20:15:10 +02:00
Dennis Schubert
9fc00d0814 Bump Redcarpet to fix OSVDB-120415 2015-04-11 19:51:18 +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
Jonne Haß
3fcd0c683c Merge pull request #5853 from svbergerem/update-changelog 
Add link to custom splash page wiki examples
 2015-04-06 12:29:21 +02:00
Steffen van Bergerem
e6cc20d686 Add link to custom splash page wiki examples 2015-04-06 12:26:28 +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ß
4b54e1684f Merge pull request #5837 from jhass/fix_default_url_options 
Move default_url_options to application.rb
 2015-04-01 18:34:27 +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
Jonne Haß
179654071b Move default_url_options to application.rb 
Apparently the subclasses got loaded before the initializers
were run, thus not inheriting the config.
 2015-04-01 14:59:07 +02:00
Jonne Haß
205e527986 Merge pull request #5836 from svbergerem/missing-button-styles 
Fix missing button styles in donate and admin sections
 2015-04-01 14:36:04 +02:00
Steffen van Bergerem
6b024dcd45 Fix missing button styles in donate and admin sections 2015-04-01 13:34:56 +02:00
Jonne Haß
5dd5f0b176 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-01 04:02:47 +02:00
Jonne Haß
51c54caa34 Remove double entries from Gemfile.lock 2015-04-01 04:02:25 +02:00
Jonne Haß
548b0d8161 Rescue correct constant in Workers::ReceiveLocalBatch 
Fixes #5834
 2015-04-01 04:01:40 +02:00
Jonne Haß
0881810f4e Merge branch 'release/0.5.0.0-RC' into develop 2015-04-01 03:07:30 +02:00
Jonne Haß
5c78ab6838 Merge pull request #5832 from svbergerem/remove-border-conversations 
Remove border from conversation stream
 2015-04-01 03:07:07 +02:00
Jonne Haß
a33f6001c1 Merge pull request #5831 from svbergerem/update-markdown-it 
Bump markdown-it
 2015-04-01 02:54:30 +02:00
Jonne Haß
9d4e7f3953 Merge pull request #5830 from svbergerem/fix-text-contact-page 
Contacts page: remove broken title from 'Start a conversation' button
 2015-04-01 02:54:18 +02:00
Jonne Haß
606d7499c2 Merge pull request #5833 from svbergerem/javascript-styleguide 
Update javascript styleguide
 2015-04-01 01:26:41 +02:00
Steffen van Bergerem
fdf3817ee2 Update javascript styleguide 2015-04-01 01:24:11 +02:00
Steffen van Bergerem
cb04e40de7 Remove border from conversation stream 2015-04-01 01:03:15 +02:00
Steffen van Bergerem
ba67196f5b Bump markdown-it 2015-04-01 00:59:13 +02:00
Steffen van Bergerem
7870f3b127 Contacts page: remove broken title from 'Start a conversation' button 2015-04-01 00:47:31 +02:00
Jason Robinson
c0b8f03225 bump to 0.5.0.0-RC 2015-03-30 17:49:15 +03:00
Dennis Schubert
bafc3ae70e Merge pull request #5822 from jhass/default_view 
Replace default.html with a regular view
 2015-03-29 00:16:35 +01:00
Jonne Haß
e274470d55 Replace default.html with a regular view 
So we can correctly reference the images
 2015-03-28 23:12:07 +01:00
Dennis Schubert
61c2fbf5ef Merge pull request #5817 from jhass/generated_error_pages 
Generate error pages on assets:precompile
 2015-03-28 21:46:35 +01:00
Jonne Haß
1d5d872d2b Merge pull request #5821 from svbergerem/fix-layout-regression 
Fix layout regression: missing header on search page
 2015-03-28 14:46:23 +01:00
Steffen van Bergerem
176938c486 Fix layout regression: missing header on search page 2015-03-28 13:54:52 +01:00
Jonne Haß
331f4ed988 updated 80 locale files [ci skip] 2015-03-27 11:44:44 +01:00