Commit graph

721 commits

Author SHA1 Message Date
Jonne Haß
e05ae411eb Merge pull request #5667 from svbergerem/help-section-routing
Add routes for help sections
2015-02-14 22:19:37 +01:00
Steffen van Bergerem
f37a018b0e Merge pull request #5521 from arlogn/profile-photos-as-thumbnails
profile photos as thumbnails
2015-02-14 02:55:57 +01:00
goobertron
5cad9b3c6c Ahem! 2015-02-11 20:30:09 +00: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
Jonne Haß
97a5e24edc update changelog for #5652 [ci skip] 2015-02-11 14:12:02 +01:00
Jonne Haß
ab2e4781f8 Merge pull request #5639 from aka001/5373_technical_limitation
Technical limitations of how old one can be on D* #5373
2015-02-09 02:28:15 +01:00
Jonne Haß
b991ffe455 Merge pull request #5624 from dimaursu/emoji
Add collation and config check
2015-02-08 00:04:46 +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
Dumitru Ursu
0829e6f394 Add collation and config check 2015-02-06 00:49:07 +02:00
Jonne Haß
c61a4a91a5 update changelog [ci skip] 2015-02-02 15:46:31 +01:00
Steffen van Bergerem
b4ff1f97e7 Merge pull request #5612 from Flaburgan/hide-signup-button-when-registration-are-disabled
Hide sign up button when registration are disabled
2015-02-02 00:44:35 +01:00
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
Faldrian
099974ddef Add shortcuts for reshare, expand Post and open first link in a post 2015-01-28 16:19:18 +01:00
Faldrian
31c39a59d1 Added post moderation buttons in SPV 2015-01-25 05:11:59 +01:00
Jonne Haß
9eaa92068f Merge pull request #5464 from SansPseudoFix/statistics_design
[Feature] Statistics page
2015-01-24 23:57:40 +01:00
Jonne Haß
caab38875b tell people to stop the server while running migrations [ci skip] 2015-01-23 14:23:47 +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
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
Jonne Haß
4d8790d61e Merge pull request #5510 from margori/779_remove_exif 2015-01-18 15:29:02 +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
James Kiesel
1c69dd7752 Add contacts/posts, and GZipping JSON exporter output 2015-01-15 00:20:19 +13:00
flaburgan
46223a2dfc Don't truncate notification emails anymore, close #4342 2015-01-10 22:10:11 +01:00
Jonne Haß
5b2d615d82 Merge pull request #5526 from svbergerem/update-pagedown
Replace pagedown by markdown-it
2015-01-10 20:38:35 +01:00
Jonne Haß
145aac4d28 Merge pull request #5532 from dimaursu/autoprefixer
Remove CSS vendor prefixes and switch to autoprefixer
2015-01-09 12:55:42 +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
Jonne Haß
e94e9add1a Merge pull request #5452 from Flaburgan/allow-non-hosted-paypal-buttons
Add currency setting to paypal donation and allow unhosted button setting

Conflicts:
	Changelog.md
2015-01-06 14:32:57 +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
Jonne Haß
8fa0ae1db2 Merge pull request #5494 from margori/4266-remove-content-from-email-notifications
Remove limited content from email notifications
2014-12-29 17:33:43 +01:00
Flaburgan
b444cdf1ea Add currency and allow unhosted button to paypal donation 2014-12-28 19:50:45 +01:00
Flaburgan
f9e9a0521d Add followed tags to the mobile menu 2014-12-28 13:48:48 +01:00
Jonne Haß
6c9f191696 Merge pull request #5491 from collimarco/solved5348
Solve #5348
2014-12-23 23:00:06 +01:00
Dennis Schubert
7b0cff3250 Merge pull request #5488 from Faldrian/5240-fix_async_searchresults_blueprint
Set refresh_search async searchresults load to use bootstrap
Fix #5240
2014-12-20 04:55:25 +01:00
Steffen van Bergerem
1efed0ea61 Merge pull request #5477 from margori/Leave_conversation_tooltip
Changed delete conversation button tooltip
2014-12-20 00:59:46 +01:00
Jonne Haß
6806b2daf8 Merge pull request #5354 from gdpelican/feature/json-exporter
Feature/json exporter
2014-12-17 16:45:25 +01:00
Jonne Haß
edc1a23f50 Merge pull request #5478 from margori/Purge_orphan_conversation
Destroy conversation when all participants leave it
2014-12-17 16:44:03 +01:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Jonne Haß
98cb1bbb1f fix some typos in the changelog [ci skip] 2014-12-13 22:23:58 +01:00
Jonne Haß
691061c68b Merge pull request #5471 from svbergerem/fix-poll-answer-order
Fix order of poll answers
2014-12-13 22:10:03 +01:00
Jonne Haß
88e150e4a0 Merge pull request #5449 from margori/3016_block_messages_to_not_sharing_user
BUG: new messages to person that is not sharing
2014-12-10 21:42:16 +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
Steffen van Bergerem
7c775208b1 Merge pull request #5422 from SansPseudoFix/fix-code-overflow-spv-and-profile
Fix code overflow spv and profile
2014-12-02 22:44:08 +01:00
Jonne Haß
5ccdcc0b95 Merge pull request #5450 from svbergerem/exceeding-profile-content
Content shouldn't exceed the profile sidebar
2014-12-02 14:33:16 +01:00
Jonne Haß
4f8cf0fe07 Merge pull request #5442 from svbergerem/pre-fill-tag-publisher
Pre-fill publisher on tag page
2014-11-30 18:59:11 +01:00
Jonne Haß
2ab16d473c Merge pull request #5410 from svbergerem/configurable-source-url
Make source code url configurable

Conflicts:
	config/diaspora.yml.example
2014-11-29 23:46:45 +01:00
Jonne Haß
ff04310158 Merge pull request #5426 from axilleas/diaspora_yml
Improve diaspora.yml comments
2014-11-29 17:55:24 +01:00