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

• b53e74d989
  Merge pull request #5173 from annando/more-daemon develop Tobias Diekershoff 2018-06-06 08:49:26 +02:00
• e005312b87 Should be just a debug log entry Michael 2018-06-06 05:32:06 +00:00
• 83243800b5 Ensure that cron workers are called even at busy times Michael 2018-06-06 05:26:22 +00:00
• e1216e3a60
  Merge pull request #5172 from annando/develop Tobias Diekershoff 2018-06-06 06:49:30 +02:00
• 1304dae0d3 Bugfix: In the daemon mode we forgot to call the cron jobs Michael 2018-06-06 03:48:04 +00:00
• 4cd730ea16
  Merge pull request #5171 from annando/removed-deprecated-upload Tobias Diekershoff 2018-06-05 09:26:05 +02:00
• e632be763c Corrected variable Michael 2018-06-05 05:44:04 +00:00
• 18a77a1b45 Removed some quick and dirty hack to upload pictures Michael 2018-06-05 05:42:26 +00:00
• 533c3a88c5
  Merge pull request #5170 from annando/poller-worker Hypolite Petovan 2018-06-04 18:41:22 -04:00
• d9bdba491a We don't poll, we work ... Bugfix for renamed config value. Michael 2018-06-04 21:17:37 +00:00
• 10e118bd63
  Merge pull request #5169 from tobiasd/20180603-nl Hypolite Petovan 2018-06-04 08:48:55 -04:00
• 90be8b47d6 update to the NL translation THX Pascal Tobias Diekershoff 2018-06-04 12:09:33 +02:00
• 0a13ab6b9f
  Merge pull request #5166 from annando/unsed-item-fields Hypolite Petovan 2018-06-03 12:19:50 -04:00
• 973ece09c5
  Merge pull request #5157 from annando/daemon Hypolite Petovan 2018-06-03 12:18:47 -04:00
• f316e96bd1 Now the dataset is said to be valid again. Michael 2018-06-03 16:11:05 +00:00
• 09c1b44381 Someone else has to fix this Michael 2018-06-03 11:42:23 +00:00
• e232ccf9e0 Trying around ... Michael 2018-06-03 11:38:03 +00:00
• 946bfd79ff Just one more ... Michael 2018-06-03 11:29:09 +00:00
• 9ade6c2b33 The testdata hadn't contained public contacts Michael 2018-06-03 11:20:22 +00:00
• e48b2a3dad Reverting it ... Michael 2018-06-03 11:12:09 +00:00
• 058d755372 I guess I broke the test tool :-) Michael 2018-06-03 11:07:24 +00:00
• e392491e94 Next try ;-) Michael 2018-06-03 10:58:03 +00:00
• b33578c137 Additional data for the test tool Michael 2018-06-03 10:47:40 +00:00
• 443d828ba7 We don't need to look for the uid Michael 2018-06-03 10:29:42 +00:00
• 28678c0fad Reverting the last test Michael 2018-06-03 10:22:10 +00:00
• 96d170c9d8 Trying to understand the test tool Michael 2018-06-03 10:04:02 +00:00
• 6985ad4fb5 Improved error message Michael 2018-06-03 09:55:41 +00:00
• b654af28fa We need "global" Michael 2018-06-03 09:40:32 +00:00
• ea498ff283 And a second SQL error fixed Michael 2018-06-03 09:21:48 +00:00
• d76fb6d0b9 Fixed SQL error Michael 2018-06-03 09:19:27 +00:00
• f081f15096 Updated sql file Michael 2018-06-03 08:46:23 +00:00
• d7c477d0f4 Don't probe anymore, but ensure that we got good contact data Michael 2018-06-03 08:36:05 +00:00
• 93fd04e381 Removed deprecated functionality Michael 2018-06-03 07:48:13 +00:00
• 3f07d01dd1 Get rid of unneeded or redundant fields Michael 2018-06-03 07:42:56 +00:00
• a720c4f501 Removed unneeded fields from the API Michael 2018-06-03 07:22:01 +00:00
• 0eafea86ed
  Merge pull request #5163 from annando/bugfix-user-item Hypolite Petovan 2018-06-02 13:49:58 -04:00
• 41423e578a Fix SQL error in tagcloud Michael 2018-06-02 17:07:28 +00:00
• bb11969c72
  Merge pull request #5162 from tobiasd/20180602-de Hypolite Petovan 2018-06-02 10:09:44 -04:00
• 4cca036a1b update DE translations Tobias Diekershoff 2018-06-02 15:56:57 +02:00
• 541f8634c0
  Merge pull request #5161 from annando/public-redir Hypolite Petovan 2018-06-02 09:18:10 -04:00
• c6c94b8cea Weird stuff Michael 2018-06-02 13:00:47 +00:00
• 81c002370e Only redirections to the same host do make sense Michael 2018-06-02 08:42:46 +00:00
• 723b5ae803 Use MagicLinkbyId when possible Michael 2018-06-02 08:28:01 +00:00
• eb63bdc30c
  Merge pull request #5160 from tobiasd/20180602-msg Michael Vogel 2018-06-02 10:27:37 +02:00
• 8a34895a23 Use magicLink whenever possible Michael 2018-06-02 08:05:06 +00:00
• 19ab854704 regen master messages.po Tobias Diekershoff 2018-06-02 08:49:58 +02:00
• 885f2b52d1 Merge remote-tracking branch 'upstream/develop' into public-redir Michael 2018-06-02 06:18:45 +00:00
• e429c26396
  Merge pull request #5159 from AndyHee/patch1 Tobias Diekershoff 2018-06-02 07:54:12 +02:00
• 2b25bd48d4 Improved distinction between delete and remove AndyHee 2018-06-02 12:40:41 +07:00
• 371f511954 Respect "don't fork" Michael 2018-06-02 05:17:32 +00:00
• 3034170088 DBStruxture can now create "memory" tables as well Michael 2018-06-02 05:03:23 +00:00
• a75d28e521 Rewording label AndyHee 2018-06-02 11:23:27 +07:00
• 6d64667cdb Merge remote-tracking branch 'upstream/develop' into daemon Michael 2018-06-02 04:03:55 +00:00
• 33c943a9dd
  Merge pull request #5156 from annando/db-comment Hypolite Petovan 2018-06-01 22:44:46 -04:00
• 047c02371a Small corrections to the database descriptions Michael 2018-06-01 22:12:35 +00:00
• 28f8beebfc Workers can now be started exclusively from the daemon and other workers Michael 2018-06-01 22:09:27 +00:00
• b5b172500d Merge remote-tracking branch 'upstream/develop' into public-redir Michael 2018-06-01 12:32:51 +00:00
• 8e461fb7bd
  Merge pull request #5154 from MrPetovan/master master Tobias Diekershoff 2018-06-01 13:48:50 +02:00
• 69300291f0
  Merge pull request #5155 from MrPetovan/develop Tobias Diekershoff 2018-06-01 13:48:18 +02:00
• 333e8d3512 Restore gitignore Hypolite Petovan 2018-06-01 07:39:26 -04:00
• 93daf7883e Merge branch 'master' into develop - Updated new develop version label - Incremented database build number Hypolite Petovan 2018-06-01 07:30:04 -04:00
• 6d20785005 Fix version number in database.sql Hypolite Petovan 2018-06-01 07:25:48 -04:00
• 9553392c12 set the release date Tobias Diekershoff 2018-06-01 09:43:06 +02:00
• 2a760bb770 Friendica 2018.05 2018.05 Tobias Diekershoff 2018-06-01 09:29:18 +02:00
• c598bf7d8f
  Merge pull request #5096 from tobiasd/3.6.1 2018.05-rc Tobias Diekershoff 2018-06-01 09:25:49 +02:00
• ae8d7267a0 "redir" is now centralized and works with the public contact Michael 2018-06-01 06:46:34 +00:00
• ae897e5aeb last minute bug fixes Tobias Diekershoff 2018-06-01 06:42:46 +02:00
• dccf07c6d8
  Merge pull request #5153 from tobiasd/20180531-nl Hypolite Petovan 2018-05-31 11:15:11 -04:00
• d1a27550fa update to the NL translation THX Pascal Deklerck Tobias Diekershoff 2018-05-31 16:38:31 +02:00
• 71ab86d0c3
  Merge pull request #5150 from abanink/5147 Hypolite Petovan 2018-05-31 10:35:24 -04:00
• 06e8d9db58
  Merge pull request #5152 from tobiasd/20180531-regform Michael Vogel 2018-05-31 14:31:33 +02:00
• 9ea6d4b26d the detected language was not stored during user creation Tobias Diekershoff 2018-05-31 08:27:27 +02:00
• a2d03e1826
  Merge pull request #5151 from tobiasd/20180531-de Michael Vogel 2018-05-31 08:26:19 +02:00
• bdb82572ba redo correct typo Bandwith to Bandwidth in mod/settings.php Pascal Deklerck 2018-05-31 06:39:30 +02:00
• de1e514be3 redo correct typo bandwith to bandwidth in mod/admin.php Pascal Deklerck 2018-05-31 06:38:14 +02:00
• b130fad1c5 update DE translations Tobias Diekershoff 2018-05-31 06:37:54 +02:00
• 8fd33f89ea undo change to mod/admin.php Pascal Deklerck 2018-05-30 20:28:38 +02:00
• 307a19074f undo changes to strings files Pascal Deklerck 2018-05-30 20:19:12 +02:00
• 6bdcb6a15b
  Merge pull request #5149 from tobiasd/20180530-msg Hypolite Petovan 2018-05-30 13:15:46 -04:00
• e1dd1aa358 5147 Typo 'bandwith' should be 'bandwidth' Pascal Deklerck 2018-05-30 08:50:29 +02:00
• b86326e04a regen master messages.po Tobias Diekershoff 2018-05-30 05:41:30 +02:00
• 2e97cbe728
  Merge pull request #5144 from annando/deleted-item Hypolite Petovan 2018-05-29 15:14:51 -04:00
• c86111d193 Coding standards Michael 2018-05-29 19:00:26 +00:00
• 26927accb1
  Merge pull request #1 from friendica/2018.05-rc Pascal 2018-05-29 20:57:43 +02:00
• 5bcb9daa43 Use local_user instead Michael 2018-05-29 18:57:32 +00:00
• ccbef51eff
  Merge pull request #5143 from tobiasd/20180528-priv Hypolite Petovan 2018-05-29 11:03:43 -04:00
• 3341deee6a
  Merge pull request #5145 from abanink/4419 Hypolite Petovan 2018-05-29 11:03:01 -04:00
• 8eefe542df rewording Tobias Diekershoff 2018-05-29 16:54:40 +02:00
• 99a88b16ff 4419 update DB version & database.sql Pascal Deklerck 2018-05-29 16:11:25 +02:00
• 1853c5623b 4419 Update the comments in src/Database/DBStructure.php from doc/database/* Pascal Deklerck 2018-05-29 10:24:36 +02:00
• 8329705eba New function to delete items for users Michael 2018-05-29 05:22:57 +00:00
• 3f93b982b6 hide profile help text clarification Tobias Diekershoff 2018-05-28 16:16:23 +02:00
• 10ca9908a6
  Merge pull request #5142 from tobiasd/20180528-it Michael Vogel 2018-05-28 14:00:14 +02:00
• 703f886492 IT translations THX Fabio Tobias Diekershoff 2018-05-28 13:50:56 +02:00
• ddc37a004f
  Merge pull request #5140 from abanink/5066 Hypolite Petovan 2018-05-27 09:10:46 -04:00
• 549020300f
  Merge pull request #5139 from rabuzarus/20180527_-_frio_tos_background Hypolite Petovan 2018-05-27 09:04:14 -04:00
• deb015be12 Changed documentation Michael 2018-05-27 10:42:47 +00:00
• c5a22f86c7 Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item Michael 2018-05-27 10:38:49 +00:00
• 334aa40292 Fix autoname output length Pascal Deklerck 2018-05-27 10:11:51 +02:00
• 32c3762989
  Merge pull request #5138 from annando/optimize-workerqueue rabuzarus 2018-05-27 10:10:11 +02:00