Commit graph

13998 commits

Author SHA1 Message Date
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
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 28b2e599fb it should be "gid" not "cid" 2017-01-08 20:11:15 +00:00
Michael f14cd2920a database.sql was updated 2017-01-07 22:04:57 +00:00
Michael ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
Michael Vogel ee39aba490 Merge pull request #3043 from Quix0r/rewrites/dbm_is_result
More usage of dbm::is_result + coding convention applied
2017-01-07 17:09:23 +01:00
Michael Vogel b7d675dbb0 Merge pull request #3071 from Hypolite/issue/#1034-2
Updated SSL english docs
2017-01-07 15:40:24 +01:00
Michael 1febf182ad Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 14:31:25 +00:00
Michael c2543f918b Last minutes changes 2017-01-07 13:52:30 +00:00
Hypolite Petovan 3caf3bccd9 Updated SSL english docs
Fixes #1034
2017-01-07 23:27:50 +11:00
Hypolite Petovan 8d195dc499 Merge remote-tracking branch 'friendica/develop' into develop 2017-01-07 23:23:50 +11:00
Michael 1b48799f08 Don't do queries if not needed 2017-01-07 11:28:18 +00:00
Michael 414c5ddae0 Use Config class/Option to deactivate the count on albums 2017-01-07 09:05:52 +00:00
Roland Häder f1dc36978a Merge branch 'develop' into rewrites/dbm_is_result 2017-01-07 09:24:07 +01:00
Roland Häder 4f25396fae Merge remote-tracking branch 'upstream/develop' into develop 2017-01-07 09:23:58 +01:00
Michael Vogel 98c5eb1d95 Merge pull request #3068 from rabuzarus/20170105_-_frio_mobile_theme_selection
Frio: Show mobile theme selection only if mobile themes are available
2017-01-07 03:00:38 +01:00
rabuzarus 898761b4a0 Show mobile theme selection only if mobile themes are available (default template) 2017-01-07 00:22:22 +01:00
Roland Häder 770816a62a Merge branch 'develop' into rewrites/dbm_is_result 2017-01-06 17:11:07 +01:00
Roland Häder 4530f4ac9d Merge remote-tracking branch 'upstream/develop' into develop 2017-01-06 17:10:40 +01:00
Michael cb5df4d715 Some corrections 2017-01-06 13:30:12 +00:00
Michael 680b16d036 Added documentation 2017-01-06 07:03:35 +00:00
Michael Vogel 0d32fce2df Merge pull request #3067 from rabuzarus/20170105_-_fix_dfrn_doxygen_todos
Bugfix: make some todos usable for doxygen in dfrn.php
2017-01-06 07:52:34 +01:00
Michael 6976ad4892 Removed some removed indexes 2017-01-06 06:37:27 +00:00
Michael 58c229031e Now for the database version 2017-01-05 22:56:49 +00:00
Michael ff3728be47 Cleaning up the stuff 2017-01-05 22:51:31 +00:00