Augier
55d258c5ac
Fix registrations displaying
2015-01-30 18:00:22 +01:00
Jonne Haß
aaadf2926f
Merge pull request #5595 from AugierLe42e/statistics-page-fix
...
Fix available services not correctly displayed
2015-01-26 23:41:34 +01:00
Augier
4ff5483025
Fix available services not correctly displayed
2015-01-26 20:45:03 +01:00
Jason Robinson
928080176a
Merge pull request #5590 from Flaburgan/fix-monthly-halfyear-active-users-count
...
Fix monthly and halfyear active users count
2015-01-26 11:55:40 +02:00
Flaburgan
69b881f34b
Fix monthly and halfyear active users count
2015-01-26 10:03:37 +01:00
Jason Robinson
ccd7561072
Merge pull request #5587 from AugierLe42e/fix-statistics-design
...
Fixes the header problem rendering statistics page
2015-01-25 15:16:18 +02:00
Augier
f14ad5ce35
Fixes the header problem rendering statistics page
2015-01-25 13:24:19 +01:00
Jason Robinson
cc52a5b91f
Merge pull request #5547 from Faldrian/spv_moderation_buttons
...
Buttons for ignore, hide, delete on SPV
2015-01-25 13:33:00 +02:00
Faldrian
31c39a59d1
Added post moderation buttons in SPV
2015-01-25 05:11:59 +01:00
Jonne Haß
d02102c7d0
Merge branch 'develop' of github.com:diaspora/diaspora into develop
2015-01-24 23:58:12 +01:00
Jonne Haß
9eaa92068f
Merge pull request #5464 from SansPseudoFix/statistics_design
...
[Feature] Statistics page
2015-01-24 23:57:40 +01:00
Augier
dd9c2f2c6b
Feature : Statistics design
2015-01-24 22:37:40 +01:00
SansPseudoFix
dc44485230
Feature : Statistics design
2015-01-24 22:34:41 +01:00
Jonne Haß
d48b787fb6
Merge pull request #5584 from Faldrian/cucumber-specify-fx-version
...
Added environment-variable to specify Firefox version for testing
2015-01-24 16:51:55 +01:00
Faldrian
913d9827e7
Added support for environment-variable to specify firefox-binary for selenium-testing
2015-01-24 16:24:20 +01:00
Jason Robinson
f8fdbed3e8
Merge pull request #5582 from SansPseudoFix/5568-fix-data-overflow-json-exporter
...
fix #5568 - overflow json exporter
2015-01-23 21:54:46 +02:00
Jonne Haß
caab38875b
tell people to stop the server while running migrations [ci skip]
2015-01-23 14:23:47 +01:00
SansPseudoFix
7e9525740b
fix #5568 - overflow json exporter
2015-01-21 17:54:59 +01:00
Jonne Haß
cd6475d572
Merge pull request #5562 from sjain1107/5560-Hide-community-spotlight
...
5560 Hide community spotlight setting if not enabled
2015-01-21 05:38:25 +01:00
Jonne Haß
a7d652c7c9
Merge pull request #5530 from dimaursu/emoji
...
Convert MySQL fields to 4 byte unicode
2015-01-21 02:34:53 +01:00
Dumitru Ursu
28fdba5d89
Shorten indexes
...
Fix merge conflict
2015-01-20 22:41:52 +02:00
Jonne Haß
3674a5a00c
Merge pull request #5578 from gdpelican/bugfix/json-exporter
...
Fix bad email formatting
2015-01-20 13:32:18 +01:00
Sakshi Jain
8b1f0453a1
5560 Hide community spotlight setting if not enabled
2015-01-20 10:31:31 +05:30
James Kiesel
7bbd9138de
Fix bad email formatting
2015-01-20 16:51:08 +13:00
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
Dumitru Ursu
a733a774d1
Refactor & DRY encoding migration
...
Dynamic row for MySQL
Set larger column index sizes
2015-01-19 02:19:39 +02:00
Dumitru Ursu
dda5f71124
Add warning about encoding change
...
Add warning about MySQL collation
Fix database index length
This allows new databases to be created with utf8mb4, on MySQL. The maximum
column size is 767 bytes. Each character is 4 bytes long -> 767 / 4 = 191
characters for the column.
2015-01-19 02:19:39 +02:00
Dumitru Ursu
b0ef4509a6
Change the adapter encoding to utf8mb4
2015-01-19 02:18:19 +02:00
SansPseudoFix
e4e1bea6e3
Feature : Statistics design
2015-01-18 15:52:42 +01:00
Jonne Haß
4d8790d61e
Merge pull request #5510 from margori/779_remove_exif
2015-01-18 15:29:02 +01:00
Marcelo Briones
63eca447d0
Strip EXIF data as user preference
2015-01-18 10:28:28 -03:00
Jonne Haß
431e2e3da9
Merge pull request #5570 from jaywink/add_missing_export_user
...
Add missing export_user queue to sidekiq config
2015-01-17 18:46:29 +01:00
Jason Robinson
5466362cc4
Add missing export_user queue to sidekiq config
2015-01-17 19:17:55 +02:00
Jonne Haß
57ce461ed5
Merge pull request #5470 from jaywink/mobile-js-fixes
...
Refactor mobile javascript to get rid of console errors.
2015-01-17 17:29:24 +01:00
Jason Robinson
9282a4ea8f
Refactor mobile javascript to get rid of console errors.
...
Fixes also mobile bookmarklet services.
2015-01-17 15:50:06 +02:00
Jason Robinson
8cd4ce2381
Add changelog for #5489 [ci skip]
2015-01-17 03:42:11 +02:00
Jason Robinson
5c810a8a2e
Merge pull request #5489 from collimarco/solved5482
...
Solved #5482
2015-01-17 03:39:03 +02: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
Jonne Haß
df0691cf9a
bump rails-assets-diaspora_jsxc
2015-01-15 17:23:08 +01:00
James Kiesel
1c69dd7752
Add contacts/posts, and GZipping JSON exporter output
2015-01-15 00:20:19 +13:00
Dennis Schubert
393f0292bf
Merge pull request #5550 from maliktunga/patch-2
...
"privacy aware" should be "privacy-aware"
2015-01-14 03:53:41 +01:00
Jonne Haß
a1e1e1030e
Merge pull request #5551 from svbergerem/markdown-it-sanitizer
...
Add more markdown-it plugins
2015-01-13 11:47:13 +01:00
Steffen van Bergerem
61c17c7896
Add more markdown-it plugins
...
activate sanitizer, sub and sup
2015-01-13 03:41:06 +01:00
Gilles-Philippe Morin
85129fba2c
"privacy aware" should be "privacy-aware"
...
http://www.w3.org/2005/Incubator/socialweb/XGR-socialweb-20101206/
https://cs.uwaterloo.ca/~uhengart/publications/gis10.pdf
http://research.microsoft.com/pubs/152497/01main.pdf
http://www.amazon.com/Privacy-Aware-Knowledge-Discovery-Applications-Techniques/dp/143980365X
2015-01-12 18:01:43 -05:00
Steffen van Bergerem
e5d725a604
Merge pull request #5545 from svbergerem/markdown-it-hashtag-0.2.3
...
Bump markdown-it-hashtag to v0.2.3
2015-01-11 18:52:25 +01:00
Steffen van Bergerem
0d9fd0aaac
Bump markdown-it-hashtag to v0.2.3
2015-01-11 18:17:17 +01:00
Jonne Haß
b347022622
Merge pull request #5543 from svbergerem/markdown-it-3.0.3
...
Bump markdown-it to 3.0.3
2015-01-11 03:24:29 +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
Jason Robinson
e558562d4f
Merge pull request #4830 from Flaburgan/dont-truncate-notification-emails
...
Don't truncate notification emails anymore
2015-01-11 00:34:52 +02:00
