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

• aa99cab918
  Merge pull request #4839 from annando/profile-update Tobias Diekershoff 2018-04-14 11:04:33 +02:00
• a53f01bacc Update the "photo" and "thumb" field in the "profile" table Michael 2018-04-14 08:03:15 +00:00
• ca614db66a
  Merge pull request #4837 from annando/improved-callstack Hypolite Petovan 2018-04-13 20:26:41 -04:00
• ce7f451196 Don't show multiple calls from the "dba" class to show the essential parts of the callstack Michael 2018-04-13 20:09:12 +00:00
• 7f51284471
  Merge pull request #4834 from AndyHee/doc20180413 Tobias Diekershoff 2018-04-13 17:01:12 +02:00
• eb01c61a56
  Update Account-Basics.md Andy H3 2018-04-13 21:41:41 +07:00
• 8686c12478
  Update Account-Basics.md Andy H3 2018-04-13 21:25:16 +07:00
• 60e8ada6d6
  Merge pull request #4824 from M-arcus/patch-1 Hypolite Petovan 2018-04-13 07:41:33 -04:00
• ce24c01ada
  Merge pull request #4829 from tobiasd/20180413-lng Michael Vogel 2018-04-13 11:43:41 +02:00
• ab8ed767bb
  Merge pull request #4827 from AndyHee/doc20180413 Tobias Diekershoff 2018-04-13 10:02:02 +02:00
• 3761797e5f
  Merge branch 'develop' into patch-1 Marcus Müller 2018-04-13 09:41:24 +02:00
• 62102cad74
  Update Accesskeys.md Andy H3 2018-04-13 12:29:10 +07:00
• 84d2906bb0
  Update Accesskeys.md Andy H3 2018-04-13 12:27:19 +07:00
• 27267d8e63 update to the FI translation THX Kris Tobias Diekershoff 2018-04-13 07:21:05 +02:00
• 053cad1de5 update to the NL translation THX Karel Tobias Diekershoff 2018-04-13 07:20:36 +02:00
• 145efbda7a
  Update Accesskeys.md Andy H3 2018-04-13 11:03:22 +07:00
• 966ebc7a5b
  Merge pull request #4825 from M-arcus/patch-3 Hypolite Petovan 2018-04-12 19:48:09 -04:00
• c882dc8baf
  Merge pull request #4823 from rabuzarus/20180412_-_enable_remote_user_if_local_user Michael Vogel 2018-04-12 23:43:43 +02:00
• 89ba3b78ff
  [BUGFIX] DB: Remove host DNS_PTR check Marcus Müller 2018-04-12 19:32:04 +02:00
• f9c34fee5a
  [BUGFIX] Network: Remove URL/domain DNS_PTR checks Marcus Müller 2018-04-12 19:28:52 +02:00
• e382dfcfbd
  [BUGFIX] DB: Don't check DNS on IPs Marcus Müller 2018-04-12 19:14:53 +02:00
• 130e16968e local_user() could also be a remote_user() rabuzarus 2018-04-12 17:10:48 +02:00
• 33d60efd8e
  Merge pull request #4822 from annando/issue-4816 Hypolite Petovan 2018-04-12 07:13:27 -04:00
• 7e004aab9b
  Merge pull request #4821 from tobiasd/20180412-lng Michael Vogel 2018-04-12 11:03:49 +02:00
• d372014d2e
  Merge pull request #4820 from tobiasd/20180412-contactreason Michael Vogel 2018-04-12 11:03:12 +02:00
• 4fd4d277f0 Store in lowercase to avoid duplicates Michael 2018-04-12 08:55:36 +00:00
• e83e31a968 Merge remote-tracking branch 'upstream/develop' into issue-4816 Michael 2018-04-12 08:53:56 +00:00
• 9cadee1d32 DE and NL translation updates THX Karel and S.Krumbholz Tobias Diekershoff 2018-04-12 10:41:49 +02:00
• 00311af79b added missiing information to theme templates Tobias Diekershoff 2018-04-12 10:33:28 +02:00
• 9d928417a1
  Merge pull request #4817 from annando/relais-duplicates Hypolite Petovan 2018-04-11 19:00:34 -04:00
• d934425d62
  Merge pull request #4812 from tobiasd/20180411-noreply Hypolite Petovan 2018-04-11 18:59:17 -04:00
• 88eaef6704 Merge branch 'issue-4816' of github.com:annando/friendica into issue-4816 Michael 2018-04-11 19:21:23 +00:00
• edcf1466a7 Relay: Avoid sending relay posts to servers that already received content Michael 2018-04-11 19:01:25 +00:00
• 75f97db4ec Issue-4816: Avoid SQL errors / Unarchive living relais servers Michael 2018-04-11 18:56:22 +00:00
• 0cab448ba1 make it unreadable... almost Tobias Diekershoff 2018-04-11 14:12:53 +02:00
• 98c9aefcbb
  Merge pull request #4813 from tobiasd/20180411-homeexample Hypolite Petovan 2018-04-11 07:58:17 -04:00
• fd92343f38
  Merge pull request #4811 from tobiasd/20180411-lng3 Hypolite Petovan 2018-04-11 07:55:57 -04:00
• c7969b2f52 more text Tobias Diekershoff 2018-04-11 11:25:16 +02:00
• df0430cb48 added example home css and html file Tobias Diekershoff 2018-04-11 11:03:18 +02:00
• ef8e984c62 noreply should not be translate-able in email addresses Tobias Diekershoff 2018-04-11 08:17:44 +02:00
• 4fbea5088a translation updates Tobias Diekershoff 2018-04-11 08:02:38 +02:00
• 4a67bc60b0
  Merge pull request #4808 from tobiasd/20180410-deis Michael Vogel 2018-04-10 18:37:48 +02:00
• 3119eabce5 IS translation THX Sveinn í Felli Tobias Diekershoff 2018-04-10 18:30:59 +02:00
• 71218ecff9 DE translations THX Copiis Tobias Diekershoff 2018-04-10 18:30:17 +02:00
• 9d5abaca1c
  Merge pull request #4807 from annando/archival-days Tobias Diekershoff 2018-04-10 14:34:18 +02:00
• 869d8ab12d We can now define the days after a contact is archived Michael 2018-04-10 11:10:02 +00:00
• eaff717696
  Merge pull request #4806 from MrPetovan/task/improve-strikethrough-support Tobias Diekershoff 2018-04-10 12:44:40 +02:00
• 369518e7b6 [BBCode] Improve support for strikethrough Hypolite Petovan 2018-04-10 06:23:40 -04:00
• d6893a45fe
  Merge pull request #4802 from Rudloff/feature/api_get_user Hypolite Petovan 2018-04-10 05:28:56 -04:00
• f3d98b2864 api_get_user() should not return false right away if the number in the URL is not a valid user Pierre Rudloff 2018-04-10 10:46:10 +02:00
• 799bd75fb2
  Merge pull request #4801 from annando/ignore-callstack Tobias Diekershoff 2018-04-10 10:04:25 +02:00
• ea9b4cc523 Ignore function "call_user_func_array" in the callstack Michael 2018-04-10 05:55:36 +00:00
• 8faf5efcad
  Merge pull request #4800 from tobiasd/20180410-lng Michael Vogel 2018-04-10 07:34:53 +02:00
• 6928f0bd02 Updates to the EN-GB, EN-US and FI-FI translations Tobias Diekershoff 2018-04-10 07:23:50 +02:00
• f527e74f97
  Merge pull request #4798 from MrPetovan/bug/prevent-empty-uid-in-preloadconfigadapter Michael Vogel 2018-04-10 07:07:10 +02:00
• c4c0d09744
  Merge pull request #4799 from MrPetovan/task/hide-ignored-unfollowed-contact-posts Michael Vogel 2018-04-10 06:58:36 +02:00
• 20843fee38 Reintroduce own posts in network list Hypolite Petovan 2018-04-09 22:50:03 -04:00
• c7ad76f9ab Prevent empty $uid from messing up the PreloadConfigAdapter Hypolite Petovan 2018-04-09 21:24:22 -04:00
• 83c3744628
  Merge pull request #4796 from Rudloff/feature/travis Hypolite Petovan 2018-04-09 20:30:59 -04:00
• e695e1060f Regroup old tests in the TextTest class Pierre Rudloff 2018-04-10 02:20:20 +02:00
• 31d1a8c6c5
  Merge pull request #4797 from annando/dba Hypolite Petovan 2018-04-09 19:43:23 -04:00
• 08abf65f7b Old database functions had been replaced in the workers Michael 2018-04-09 21:34:23 +00:00
• 9a40f17257 Remove old tests Add tests for the BaseObject class Pierre Rudloff 2018-04-09 23:03:29 +02:00
• 2c7514d03c Enable Travis Pierre Rudloff 2018-04-09 21:49:23 +02:00
• 7d953d952e Various small fixes (#4795) Pierre Rudloff 2018-04-09 21:34:53 +02:00
• 74e189039a
  Merge pull request #4768 from MrPetovan/task/hide-ignored-unfollowed-contact-posts Michael Vogel 2018-04-09 20:08:20 +02:00
• 2f016d4e45
  Merge pull request #4794 from Rudloff/feature/return_type Hypolite Petovan 2018-04-09 14:07:27 -04:00
• 773591a6ba Add some missing return types Pierre Rudloff 2018-04-09 19:34:02 +02:00
• 4b36f3ad05 api_format_data() seems to never return an object Pierre Rudloff 2018-04-09 19:19:00 +02:00
• b684a74449
  Merge pull request #4793 from Rudloff/feature/datatypes Hypolite Petovan 2018-04-09 13:13:59 -04:00
• 9cde7881ee Throw a ForbiddenException if api_get_user() returns false Pierre Rudloff 2018-04-09 17:36:33 +02:00
• 99b446eccc Remove useless intval() calls in mod/network Hypolite Petovan 2018-04-09 09:19:49 -04:00
• eea32ede5c
  Merge pull request #4792 from ben-utzer/patch-1 Hypolite Petovan 2018-04-09 09:17:32 -04:00
• a4f469d187
  RemainAfterElapse=False utzer 2018-04-09 18:42:02 +05:30
• 785ef70e5d
  Merge pull request #4789 from tobiasd/20180409-lng Michael Vogel 2018-04-09 10:53:16 +02:00
• ca3325bcbb updated translations Tobias Diekershoff 2018-04-09 10:17:25 +02:00
• 66bcbe210a
  Merge pull request #4788 from annando/more-relay Tobias Diekershoff 2018-04-09 08:31:43 +02:00
• 105f3ca747 Relay: Avoid empty tags / Always use the "relay account" Michael 2018-04-09 05:53:23 +00:00
• 7563adcc7d Use positive form for relationship check in mod/network Hypolite Petovan 2018-04-08 20:47:16 -04:00
• a2607ea00a
  Merge pull request #4785 from annando/magiclink Hypolite Petovan 2018-04-08 20:38:33 -04:00
• 5c2b54009e The magic link is added at more places Michael 2018-04-08 19:17:50 +00:00
• e860cdf6a8 Swap if / elseif Alexandre Alapetite 2018-04-08 16:02:25 +02:00
• b28fd98acd Replaced < comparison with IN for contact.rel in mod/network Hypolite Petovan 2018-04-08 09:59:43 -04:00
• 82f1f2f00e Remove SQL column legacy_password Alexandre Alapetite 2018-04-08 14:53:12 +02:00
• cb26cd6d5d Remove legacy_password test Alexandre Alapetite 2018-04-08 14:42:18 +02:00
• fa7bed8929
  Merge pull request #4783 from annando/queue-relay Hypolite Petovan 2018-04-08 08:35:36 -04:00
• 129f6806f6 Fix update password rehash Alexandre Alapetite 2018-04-08 12:28:04 +02:00
• b2520bc48e
  Merge pull request #4780 from tobiasd/20180408-pl Michael Vogel 2018-04-08 12:36:56 +02:00
• a75858f02c Don't queue relay posts Michael 2018-04-08 09:46:47 +00:00
• 65b738ecfa update for PL translation THX waldis Tobias Diekershoff 2018-04-08 11:02:31 +02:00
• 7f0bd63b7d
  Merge pull request #4773 from MrPetovan/task/4629-move-dev-executables Michael Vogel 2018-04-08 07:44:24 +02:00
• 48f8492056
  Merge pull request #4779 from Rudloff/feature/list_api Hypolite Petovan 2018-04-07 21:03:50 -04:00
• d0591dd882 The first argument for api_format_items() must be an array Pierre Rudloff 2018-04-08 01:05:33 +02:00
• 9c351bad68 Fix wrong use of empty() Pierre Rudloff 2018-04-08 00:55:05 +02:00
• 61050c8e30
  Merge pull request #4777 from Rudloff/feature/list_api Hypolite Petovan 2018-04-07 17:47:21 -04:00
• bef3799942 Use empty() instead of !x() Pierre Rudloff 2018-04-07 23:21:51 +02:00
• 333eb5f9dd Add missing variable Pierre Rudloff 2018-04-07 23:20:30 +02:00
• b775cba8c2 Remove confusing comment Pierre Rudloff 2018-04-07 22:39:38 +02:00
• 036803d8c7 Typo Pierre Rudloff 2018-04-07 22:37:57 +02:00
• 5d8d62015c Make list_id parameter mandatory in api/lists/statuses Pierre Rudloff 2018-04-07 22:36:54 +02:00