Commit graph

Select branches

Hide pull requests

2018.05-rc

develop

master

2.1

2.2

2.21

2.3

2.32

2.33

2.34

2.35

2.36

2.37

2.38

2.39

2.3beta1

2.3beta2

2018.05

3.0

3.01

3.1

3.2

3.3

3.3-RC

3.3.1

3.3.2

3.3.3

3.4

3.4.1

3.4.2

3.4.3

3.4.3-2

3.5

3.5.1

3.5.2

3.5.3

3.5.4

3.6

Mono Color

• a4d976b70f Fix: Avoid getting spammed when an admin has got several accounts Michael 2018-05-19 03:38:43 +00:00
• 931e9182ff
  Merge pull request #5082 from annando/federation-warning Hypolite Petovan 2018-05-18 12:26:08 -04:00
• 5d708fd9a9 Avaoid warning when no valid data could be read Michael 2018-05-18 16:07:55 +00:00
• 2460cbc09e
  Merge pull request #5081 from annando/ostatus-subscription-fix Hypolite Petovan 2018-05-18 09:31:07 -04:00
• be469f6bca Fix for subscribing to the wrong feed from OStatus Michael 2018-05-18 13:23:27 +00:00
• 83ff57777f
  Merge pull request #5079 from annando/fix-self Hypolite Petovan 2018-05-18 08:54:00 -04:00
• 599551ba51
  Merge pull request #5080 from annando/changed-structure Hypolite Petovan 2018-05-18 08:53:37 -04:00
• 0374b0be6a Changed database structure Michael 2018-05-18 12:50:57 +00:00
• 2b0d37b7d0
  Merge pull request #5078 from annando/fix-ostatus-subscription Hypolite Petovan 2018-05-18 08:27:31 -04:00
• 8983c61023 Fix: Sometimes the contact endpoints seem to be wrong Michael 2018-05-18 12:26:10 +00:00
• feb3d76a5b Fix: Subscriptions from GNU Social partially don't work Michael 2018-05-18 12:18:12 +00:00
• 13ae3436b6
  Merge pull request #5076 from tobiasd/20180517-extract Hypolite Petovan 2018-05-17 19:59:57 -04:00
• 1d2b0c0a81
  Merge pull request #5077 from annando/fix-blocking-ostatus Hypolite Petovan 2018-05-17 19:59:08 -04:00
• 4355014492 Now it should work ... Michael 2018-05-17 23:47:15 +00:00
• f4a71b76dd Dynamic priority handling Michael 2018-05-17 23:43:44 +00:00
• 6a8c85fac4 Changed database structure Michael 2018-05-17 23:35:24 +00:00
• 61824119e4 Moved functionality in new model class Michael 2018-05-17 23:30:49 +00:00
• 5a1e1c1ec9 Fix to OStatus delivery to be not so blocking to other tasks Michael 2018-05-17 22:17:03 +00:00
• fb4f9eb875 dont parse the addons directory for translateable strings Tobias Diekershoff 2018-05-17 22:41:06 +02:00
• f764adef5a
  Merge pull request #5073 from tobiasd/20180517-msg Hypolite Petovan 2018-05-17 11:40:19 -04:00
• 2ec8bf24b3 regen master messages.po Tobias Diekershoff 2018-05-17 16:58:51 +02:00
• 41b7d75cca
  Merge pull request #5072 from Alkarex/ru-plural-intval-bug Tobias Diekershoff 2018-05-17 09:43:25 +02:00
• 102377f19f Rebuild PO to strings Alexandre Alapetite 2018-05-17 09:31:29 +02:00
• f980516545 Fix PoToPhp Alexandre Alapetite 2018-05-17 08:12:55 +02:00
• ac67f3c154
  Merge pull request #5071 from annando/fix-duplicated-posts Tobias Diekershoff 2018-05-17 07:59:56 +02:00
• 2a9d364bb7 i18n ru intval bug Alexandre Alapetite 2018-05-17 07:57:55 +02:00
• b333c7ae2e Bugfix: Only send a notifier when the item was really edited Michael 2018-05-17 05:49:55 +00:00
• e107fae8e8
  Merge pull request #5070 from Alkarex/sizeof-bug Tobias Diekershoff 2018-05-17 07:43:18 +02:00
• e7d2d27938 sizeof bug Alexandre Alapetite 2018-05-17 07:35:58 +02:00
• c9bca54228
  Merge pull request #5069 from Quix0r/tickets/4965 Hypolite Petovan 2018-05-16 21:02:46 -04:00
• dd18cf8de5
  Fixes for #4965: - updated messages.po file Roland Häder 2018-05-17 02:27:30 +02:00
• d1783e9aeb
  Fixes for #4965: - better descriptive tooltip for adding/removing contact from/to group Roland Häder 2018-05-17 02:23:20 +02:00
• b1c38641cd
  Merge pull request #5068 from Quix0r/fixes/rc-openid-login Hypolite Petovan 2018-05-16 18:42:43 -04:00
• 6129eb1623
  OpenId possibly fixed: - The LightOpenId class' constructor now requires the hostname from where the requested started, added it now - sometimes need to invoke get_app() as $a was not around Roland Häder 2018-05-17 00:21:06 +02:00
• ce75177d4e
  Merge pull request #5022 from Rudloff/feature/test_api Hypolite Petovan 2018-05-16 08:25:11 -04:00
• e8e93768db
  Merge pull request #5065 from tobiasd/2018.05-rc Michael Vogel 2018-05-16 14:21:24 +02:00
• f285d9c7eb add link to TOS in frios registration template if enabled Tobias Diekershoff 2018-05-16 13:41:56 +02:00
• e7fceb8e61 Make DatabaseTest::getConnection() return the correct database name to PHPUnit Pierre Rudloff 2018-05-16 13:15:28 +02:00
• f3ca3b2bd5 Add some explanation in DatabaseTest::getConnection() Pierre Rudloff 2018-05-16 13:14:50 +02:00
• f7064be41f Remove useless line breaks in DatabaseTest Pierre Rudloff 2018-05-16 13:09:05 +02:00
• 5ece452a32 Remove unused class import in DatabaseTest Pierre Rudloff 2018-05-16 13:08:17 +02:00
• eec0826750 added link to the TOS page if it is activated Tobias Diekershoff 2018-05-16 11:57:06 +02:00
• dcc8274353
  Merge pull request #5064 from annando/followup-pr-5060 Tobias Diekershoff 2018-05-16 11:12:17 +02:00
• 3b2752c2fe Follow up to PR 5060: Missing index update Michael 2018-05-16 08:59:15 +00:00
• f11b6c131e
  Merge pull request #5061 from AndyHee/2018.05-rc Hypolite Petovan 2018-05-16 00:26:20 -04:00
• e22f7a3c31
  Update sample-nginx.config Andy H3 2018-05-16 11:10:19 +07:00
• c3a532a9f6
  Merge pull request #5060 from annando/item-delete Hypolite Petovan 2018-05-15 23:56:23 -04:00
• 84248ac4c1 Grammar stuff Michael 2018-05-16 03:54:08 +00:00
• c9f55f6b3d Show "Remove from your screen" or "delete" depending of the impact of the deletion Michael 2018-05-15 21:06:34 +00:00
• e77cd17495 We do the notify stuff now directly in the item class Michael 2018-05-15 19:50:29 +00:00
• fe8a4d50c8 Merge branch 'item-delete' of github.com:annando/friendica into item-delete Michael 2018-05-15 19:31:05 +00:00
• 4a1bbd114c Lower priority for "remote self" Michael 2018-05-15 19:29:14 +00:00
• 82937189ba Only delete undeleted items Michael 2018-05-15 19:25:35 +00:00
• db3bcd8ac6
  Merge pull request #5059 from tobiasd/20180515-fixdev Hypolite Petovan 2018-05-15 13:53:31 -04:00
• fc60e23314 Added comments / hourly workerqueue deletion Michael 2018-05-15 17:50:29 +00:00
• b74f9e07bc revertig file movements Tobias Diekershoff 2018-05-15 19:23:13 +02:00
• f6d4d83bd1
  Merge pull request #5058 from M-arcus/patch-2 Hypolite Petovan 2018-05-15 12:53:17 -04:00
• 44a5fe95d4 [DOCS] Environment variables: Add explanation Marcus Müller 2018-05-15 18:49:40 +02:00
• 3e475f3b82 Delete the shadow post when it is the last one Michael 2018-05-15 16:40:13 +00:00
• 973d62c087
  Merge pull request #5057 from M-arcus/patch-2 Hypolite Petovan 2018-05-15 12:13:34 -04:00
• 38666fa7fa [BUGFIX] .htaccess: Rename file Marcus Müller 2018-05-15 18:09:24 +02:00
• c17db5e26f Revert "[BGUFIX] .htaccess: Add file" Marcus Müller 2018-05-15 18:00:12 +02:00
• 7e099bf9c0
  [BGUFIX] .htaccess: Add file Marcus Müller 2018-05-15 18:00:12 +02:00
• 4a7bf95926 Fix: Delete all item copies if it is an original item Michael 2018-05-15 15:51:58 +00:00
• 0848cef605
  Merge pull request #5055 from annando/worker-spawning Tobias Diekershoff 2018-05-15 08:22:33 +02:00
• ba4f9b6136
  Merge pull request #5054 from annando/diaspora-comments Tobias Diekershoff 2018-05-15 07:30:34 +02:00
• 8564eeec4e Fix: public comments weren't distributed to the followers. Michael 2018-05-15 04:33:28 +00:00
• abbe213fef
  Merge pull request #5042 from Quix0r/rewrites/curly-braces-is-result-usage-002 Hypolite Petovan 2018-05-14 22:51:07 -04:00
• 5e2d2e15d6
  Merge pull request #5053 from Quix0r/latest-rc Hypolite Petovan 2018-05-14 21:39:25 -04:00
• e409001dfb
  Fixed "constant" result, maybe there is a $ missing? Roland Häder 2018-05-15 03:23:24 +02:00
• 5a7bcd4725
  Added empty line after if() block (convention) Roland Häder 2018-05-14 22:34:11 +02:00
• f34d72c143
  Fixes: - used empty() instead of x() - removed superflous count() Roland Häder 2018-05-14 22:25:39 +02:00
• d0c7ba5257
  Fixed parser error Roland Häder 2018-05-13 22:50:09 +02:00
• debcdea82a
  Continued: - merged 2 if() into one with && - added TODO for possible rewrite (avoid "complex" code) Roland Häder 2018-05-13 16:58:40 +02:00
• bacb7b70f6
  Cleanups: - added empty lines - removed old-lost commented out line Roland Häder 2018-05-13 16:46:58 +02:00
• 538760d9da
  No direct $a->config['foo'] needed when Config::get() is around ... Roland Häder 2018-05-13 08:01:16 +02:00
• 751394fc1d
  Redis: - added support for redis server: Roland Häder 2018-05-13 07:38:53 +02:00
• 69ac6feff7
  Continued: - you can directly use constant($var) instead of this switch() Roland Häder 2018-05-13 05:36:47 +02:00
• fe1e7b92f2
  Continued: - system,worker_dont_fork may not be set, always set default to "false" to have it properly set as Config::get() may one day behave differently Roland Häder 2018-05-13 04:40:52 +02:00
• 94a02f8572
  Continued: - return is a keyword, not a function, so don't add braces here Roland Häder 2018-05-10 15:13:08 +02:00
• 57e668d9e0
  Continued: - avoided else() block which reduces code complexibility - used more x() - added curly braces - added known type-hints Roland Häder 2018-05-10 14:48:27 +02:00
• e0a07d5f27
  Continued: - used x() to make sure the array key is there, else an E_NOTICE is triggered - added type-hints where it is safe Roland Häder 2018-05-10 13:19:50 +02:00
• 17a39340b5
  "pending" shouldn't be set as well by default ... Michael 2018-05-03 18:19:40 +00:00
• f28301e18f
  Urgent bugfix: Public contacts had been blocked automatically when created Michael 2018-05-03 17:43:10 +00:00
• 72f5b863d8
  Reshares had been detected falsely so that were rejected by Diaspora Michael 2018-05-03 13:03:41 +00:00
• f19066c6cf
  Ensure that the link will be displayed correctly on Diaspora Michael 2018-05-03 04:43:50 +00:00
• dcfd81e2ee
  Some corrections Michael 2018-05-02 21:12:48 +00:00
• d54c79a772
  Replace old database queries with the new ones Michael 2018-05-02 19:26:15 +00:00
• 8bc565be74
  Continued: - ops, another rebase-leftover fixed Roland Häder 2018-05-03 02:17:16 +02:00
• befb080b70
  Continued: - moved to Config class Roland Häder 2018-05-02 23:13:03 +02:00
• a8e2c3a3ad
  Continued: - ops, did accidently modify composer.lock ... :-( Roland Häder 2018-05-02 23:07:28 +02:00
• 15c570495b
  Windows' CRLF are looking strange under Linux, let's get rid of them/ Roland Häder 2017-07-26 22:16:29 +02:00
• 3868d830e7
  General project change: - cleaned up vendor/ as it is a "build" (means being locally recreated) directory and therefor should *NOT* be committed. - updated composer.lock - that is what would be updated now if vendor/ would be ignored, instead a lot files has been changed in vendor/ - people running composer install regulary will get (with the old way) a dirty working copy (version-controlled files being modified) and then cannot update Roland Häder 2017-07-20 20:19:28 +02:00
• cdc24a73ca
  Fixes for composer: - ./vendor/ is being prepared by executing utils/composer.phar install, no need to have it around - converted .gitignore to LF line-ending (more common over the whole project) - no need to have them around ... Roland Haeder 2017-04-02 21:29:06 +02:00
• 2fd14eac70
  Opps, cutted this out by accident ... Roland Haeder 2017-03-25 15:06:54 +01:00
• 11dcb31960
  was a bit confusing for me or I was not sleeping to much ... Roland Haeder 2017-03-25 13:46:28 +01:00
• ce07c20130
  PHP5 does not support native type-hints, except array + used dbm::is_result() Roland Haeder 2017-03-25 13:37:15 +01:00
• 6579396627
  removed TODO, one day this all needs refacturizing ... Roland Haeder 2017-03-25 13:01:41 +01:00
• 7526afcf13
  Continued: - converted multiple single-line comments into one multi-line comment (please stop abusing programming languages!) - added more TODO tags for type-hints (upcoming rewrite) - opps, one space was only fixed in develop branch, not in this PR branch Roland Haeder 2017-03-24 20:39:00 +01:00
• f5f1650b62
  fixed comment and explained one Roland Haeder 2017-03-23 23:37:58 +01:00