Commit graph

14022 commits

Author SHA1 Message Date
Hypolite Petovan cb37dfd0a1 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-01-25 15:28:54 -05:00
Michael Vogel 6ff0cfb315 Merge pull request #3102 from Hypolite/feature/3101-modal-auto-focus
Feature 3101 modal auto focus
2017-01-22 22:51:24 +01:00
Hypolite Petovan 73f182069e Auto-focus first input field of modal when shown
Fixes #3101
2017-01-22 11:01:10 -05:00
Hypolite Petovan dbf7c7d9ad Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-01-22 09:02:59 -05:00
Michael Vogel b9ff10cda4 Merge pull request #3099 from rabuzarus/20170120_-_fix_event_string_variables
Bugfix: fix typo in event variable
2017-01-20 16:14:13 +01:00
rabuzarus 5ab6843f38 Bugfix: fix typo in event variable 2017-01-20 13:24:53 +01:00
Michael Vogel d19a1e1f9c Merge pull request #3098 from fabrixxm/lang/it
Update IT strings
2017-01-19 09:46:07 +01:00
Fabio 1af84c095d transifex-client config 2017-01-18 14:05:57 +01:00
Fabio 81529a43ad Update IT strings 2017-01-18 12:38:09 +01:00
Tobias Diekershoff d43c0d51dd Merge pull request #3095 from annando/bugfix-app
Bugfix for failed events page and api
2017-01-17 07:16:29 +01:00
Michael 0c310db23d Bugfix for failed events page and api 2017-01-16 20:59:16 +00:00
Tobias Diekershoff b81a1fde09 Merge pull request #3093 from annando/issue-3011
Issue 2364: OStatus: Don't fetch liked contents
2017-01-16 07:31:53 +01:00
Tobias Diekershoff e7966171dd Merge pull request #3094 from annando/1701-hubzilla-probe
Fixing avatar problems when probing Hubzilla contacts
2017-01-16 07:27:03 +01:00
Michael e63e241f8f Hubzilla doesn't send a width attribute in the avatar picure in the hcard 2017-01-15 19:46:04 +00:00
Michael 2362e78c8f Issue 3011 (and others): OStatus: Don't fetch liked contents 2017-01-15 09:07:57 +00:00
Tobias Diekershoff b067a11146 Merge pull request #3088 from beardyunixer/patch-1
Update FAQ.md
2017-01-12 16:32:38 +01:00
beardyunixer 9183ef4385 Update FAQ.md
Grammar - a few sentences that are technically correct, but don't sound quite right to a native speaker.
2017-01-12 12:13:13 +00:00
rabuzarus b1120f5238 Merge pull request #3080 from annando/1701-curl-range
Download limit for fetching data via "z_fetch_url"
2017-01-12 12:15:58 +01:00
Michael e67133ef56 Merge remote-tracking branch 'upstream/develop' into 1701-curl-range
Conflicts:
	mod/oexchange.php
	mod/uimport.php
2017-01-12 07:25:44 +00:00
rabuzarus 63e2695d22 Merge pull request #3074 from annando/1701-diaspora-ostatus-mentions
Bugfix: Answers to OStatus posts should never reach Diaspora
2017-01-12 02:12:25 +01:00
rabuzarus 4a8cff74f2 Merge pull request #3081 from annando/1701-top-level
When commenting too fast, messages weren't delivered to Diaspora
2017-01-12 02:11:43 +01:00
rabuzarus 3f655ee7c4 Merge pull request #3085 from annando/1701-poll-contacts
Correction of commit a96eb3428d
2017-01-12 00:36:54 +01:00
Michael fcd0b198f5 Correction of commit a96eb3428d 2017-01-11 23:18:51 +00:00
Michael 12dd06f726 Merge remote-tracking branch 'upstream/develop' into 1701-top-level 2017-01-11 23:15:23 +00:00
Michael Vogel 5eaa5951a1 Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3
Normalize App parameter declaration (mod folder, 2 out of 3)
2017-01-11 22:49:01 +01:00
Michael Vogel 05a2989ecb Merge pull request #3079 from Hypolite/issue/#3039-mod-3of3
Normalize App parameter declaration (mod folder, 3 out of 3)
2017-01-11 22:33:41 +01:00
Michael Vogel c02e697442 Merge pull request #3083 from rabuzarus/20170111_-_diaspora_logger_debug
diaspora - switch logger for "non subscribed messages" to LOGGER_DEBUG
2017-01-11 14:32:25 +01:00
rabuzarus 0e64d462df diaspora - add braces 2017-01-11 13:02:18 +01:00
rabuzarus 2daa0936db diaspora - switch logger for "non subscribed messages" to LOGGER_DEBUG 2017-01-11 12:45:25 +01:00
Michael Vogel 3c51820515 Merge pull request #3076 from Hypolite/issue/#3039-boot-doc-include
Normalize App parameter declaration (doc-include folders, boot)
2017-01-11 09:01:48 +01:00
Michael Vogel 6c9b9dabcc Merge pull request #3082 from tobiasd/20170111-newyear
happy 2017
2017-01-11 08:59:43 +01:00
Hypolite Petovan 160d462d3f Fix typo in doc 2017-01-11 18:42:49 +11:00
Tobias Diekershoff a9e66a285e happy 2017 2017-01-11 08:09:13 +01:00
Michael Vogel 38a41eefd2 Merge pull request #3075 from Hypolite/issue/#3039-theme
Normalize App parameter declaration (view folder)
2017-01-11 07:50:49 +01:00
Hypolite Petovan 30a77cc10a Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039-theme
# Conflicts:
#	view/theme/frio/theme.php
2017-01-11 09:39:38 +11:00
Michael Vogel df8b522f6b Merge pull request #3077 from Hypolite/issue/#3039-mod-1of3
Normalize App parameter declaration (mod folder, 1 out of 3)
2017-01-10 17:28:21 +01:00
Michael 84b733e1bf Standards stuff should make Hypolite happy. 2017-01-10 16:11:08 +00:00
Michael 3cf1f5e532 Compare instead of assign ... 2017-01-10 10:23:51 +00:00
Michael c44f859edf We should check for the item, not the parent. 2017-01-10 07:58:17 +00:00
Michael fafeea4382 When commenting too fast, messages weren't delivered to Diaspora 2017-01-10 07:40:57 +00:00
Michael a2debaa68a Download limit for fetching data via "z_fetch_url" 2017-01-09 23:10:32 +00:00
rabuzarus f880fb9a42 Merge pull request #3069 from annando/1612-unused-indexes
Index improvements
2017-01-09 22:30:46 +01:00
Hypolite Petovan a7ce601580 Normalize App parameter declaration (mod folder, 3 out of 3) 2017-01-09 23:14:55 +11:00
Hypolite Petovan f92918f471 Normalize App parameter declaration (mod folder, 2 out of 3) 2017-01-09 23:14:25 +11:00
Hypolite Petovan 8a197055e3 Normalize App parameter declaration (mod folder, 1 out of 3) 2017-01-09 23:12:54 +11:00
Hypolite Petovan 87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Hypolite Petovan 623479a346 Normalize App parameter declaration (view folder) 2017-01-09 23:06:08 +11:00
Michael 16f0221e4c DBClean now has a smaller limit/Query improvements 2017-01-09 09:37:37 +00:00
Michael 65226778fe More standards 2017-01-09 06:40:56 +00:00
Michael fc60e7f5dd Making Hypolite smile 2017-01-08 22:29:55 +00:00