clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 91eb644743 Fix formatting in Console\PoToPhp Hypolite Petovan 2018-03-24 16:08:56 -04:00
  • 641bd5eaa6 Merge pull request #4674 from annando/acl-fix Hypolite Petovan 2018-03-24 15:48:02 -04:00
  • 341499e8ca standards Michael 2018-03-24 19:40:35 +00:00
  • 7acb4b0434 Merge pull request #4676 from annando/clean-url Hypolite Petovan 2018-03-24 15:31:07 -04:00
  • 9665f4ed41 Merge pull request #4675 from annando/group-delete Hypolite Petovan 2018-03-24 15:25:26 -04:00
  • 324baa6b8b Removed test code Michael 2018-03-24 18:48:40 +00:00
  • 850d9b4c0b Line feeds fixed, not change in functionality Michael 2018-03-24 18:39:13 +00:00
  • 885d794958 Fix ACL data Michael 2018-03-24 18:38:05 +00:00
  • 801d2ee166 Merge pull request #4671 from tobiasd/20180324-trans Hypolite Petovan 2018-03-24 11:40:35 -04:00
  • b6839fae67 update to the zh-cn translation THX 朱陈锬 Tobias Diekershoff 2018-03-24 16:09:45 +01:00
  • 4fbdf6506d update for DE translation Tobias Diekershoff 2018-03-24 16:07:33 +01:00
  • aaccee3aac Merge pull request #4668 from MrPetovan/bug/4665-fix-console-hashbang Tobias Diekershoff 2018-03-24 14:21:26 +01:00
  • cf56db9185 Use correct /bin/bash hashbang in bin/console Hypolite Petovan 2018-03-24 08:40:43 -04:00
  • f293d2e993 Merge pull request #4667 from Alkarex/fix-bin-console Hypolite Petovan 2018-03-24 08:38:29 -04:00
  • e64196c7b3 Fix PHP cannot take a shell script Alexandre Alapetite 2018-03-24 12:47:40 +01:00
  • 07a1796e8f Fix: Groups can now be deleted again Michael 2018-03-24 07:26:57 +00:00
  • bac60164e7 New function to keep the self contact updated Michael 2018-03-24 06:15:18 +00:00
  • ed93fce743 Merge pull request #4662 from MrPetovan/bug/4660-restore-composer-5.6-compatibility Hypolite Petovan 2018-03-23 20:53:52 -04:00
  • af4a206d7b Merge pull request #4661 from MrPetovan/develop Hypolite Petovan 2018-03-23 20:53:07 -04:00
  • 4e33f7f458 Restore executable permissions in bin/ Hypolite Petovan 2018-03-23 20:47:58 -04:00
  • 07a175b29f [Composer] Downgrade paragonie/constant_time_encoding to PHP 5.6 compatible version Hypolite Petovan 2018-03-23 20:41:55 -04:00
  • 9abe3dade2 Bump database version number after RC merge Hypolite Petovan 2018-03-23 20:01:53 -04:00
  • 96a6c098bc Merge pull request #4657 from MrPetovan/task/3878-move-event-to-src Michael Vogel 2018-03-23 21:24:20 +01:00
  • 241ed9a9cd Merge pull request #4658 from fabrixxm/dev/update-vagrant Hypolite Petovan 2018-03-23 15:40:20 -04:00
  • 055855bf9b Handle URL with unicode characters Michael 2018-03-23 18:41:59 +00:00
  • 57e6b8ac1a Dev env: fix cache test data fabrixxm 2018-03-23 18:19:29 +01:00
  • 3aa015d381 Merge pull request #4651 from MrPetovan/develop fabrixxm 2018-03-23 17:21:35 +01:00
  • f05e773a8c Dev env: fix admin email fabrixxm 2018-03-23 17:16:22 +01:00
  • 2cd2eff772 Merge pull request #4654 from fabrixxm/dev/update-vagrant Hypolite Petovan 2018-03-23 11:49:14 -04:00
  • 2e69bd95a0 update test data for dev env fabrixxm 2018-03-23 16:38:26 +01:00
  • 705d1432ce Merge pull request #4653 from fabrixxm/dev/update-vagrant Hypolite Petovan 2018-03-23 11:23:00 -04:00
  • dd37176a01 Fix Vagrant dev env fabrixxm 2018-03-23 16:12:11 +01:00
  • ecd660cb10 Updated version number Hypolite Petovan 2018-03-23 06:39:51 -04:00
  • a7c48f40b7 Enable CalendarExport widget on /events Hypolite Petovan 2018-03-19 09:09:07 -04:00
  • c5cd569447 Restore previous permission comment in Widget\CalendarExport Hypolite Petovan 2018-03-18 01:32:43 -04:00
  • d36bc29ce9 Finally fix the permissions for Widget\CalendarExport Hypolite Petovan 2018-03-18 01:23:38 -04:00
  • 95792f6b79 Fix typo in mod/events Hypolite Petovan 2018-03-17 16:43:15 -04:00
  • 72b552895e Restore missing permission check in Widget\CalendarExport Hypolite Petovan 2018-03-17 16:42:28 -04:00
  • 254974826f Fix wrong contact retrieval condition in Event::store Hypolite Petovan 2018-03-17 10:05:17 -04:00
  • bc12ba68cd Fix wrong parameter check in Event::store Hypolite Petovan 2018-03-17 10:05:02 -04:00
  • 089f556327 Initialize $event in Event::store Hypolite Petovan 2018-03-17 00:32:46 -04:00
  • 89e9cbb0b5 Remove private key from event array in Event::store Hypolite Petovan 2018-03-17 00:32:08 -04:00
  • 4eaf0d76b0 Remove include/event Hypolite Petovan 2018-03-16 21:47:48 -04:00
  • 6e7c6ab0fa Remove references to include/event Hypolite Petovan 2018-03-16 21:47:34 -04:00
  • f7e2071117 Replace include/event function with method calls Hypolite Petovan 2018-03-16 21:45:02 -04:00
  • 5aecc758f9 Replace include/event function content by method calls Hypolite Petovan 2018-03-16 21:22:40 -04:00
  • 8c956ac0c8 Add new classes Hypolite Petovan 2018-03-16 21:22:19 -04:00
  • 27d94023ee Merge branch 'master' into develop Hypolite Petovan 2018-03-23 06:15:55 -04:00
  • bacc5de3a2 Friendica version 3.6 - The Tazmans Flax-lily Tobias Diekershoff 2018-03-23 07:14:49 +01:00
  • c845415a99 Merge pull request #4637 from tobiasd/3.6 Tobias Diekershoff 2018-03-23 07:09:54 +01:00
  • 23f7d452a1 2018-03-23 it is Tobias Diekershoff 2018-03-23 07:08:56 +01:00
  • 9d83369d88 DFRN payload is receivable via the Diaspora transport layer Michael 2018-03-23 05:08:47 +00:00
  • c01c0681c0 Merge pull request #4650 from annando/url-shorten-ostatus Hypolite Petovan 2018-03-22 16:54:19 -04:00
  • dccfc83a2d No display improvements for regular posts Michael 2018-03-22 20:47:31 +00:00
  • 318de2f590 Merge remote-tracking branch 'upstream/3.6-rc' into url-shorten-ostatus Michael 2018-03-22 20:42:29 +00:00
  • c5c0887f59 Merge pull request #4649 from annando/fix-thr-parent Hypolite Petovan 2018-03-22 12:24:37 -04:00
  • b171fb1f24 Fix: Items with "uid=0" always had the "parent-uri" as "thr-parent" Michael 2018-03-22 16:18:49 +00:00
  • cce3030e79 8th (4369 got closed) Tobias Diekershoff 2018-03-22 14:20:07 +01:00
  • 67d791df3b 7th (more work on themes and events) Tobias Diekershoff 2018-03-22 06:53:58 +01:00
  • 0d60f1a7d3 Merge pull request #4646 from Andi-K/3.6-rc Hypolite Petovan 2018-03-21 21:12:04 -04:00
  • 97840abdd6 Andi 2018-03-22 01:25:43 +01:00
  • 1e2820805b vier: replace hard coded style path Andi 2018-03-22 01:15:59 +01:00
  • f3358b7af4 Merge pull request #4645 from Andi-K/3.6-rc Hypolite Petovan 2018-03-21 20:01:01 -04:00
  • c69fa859c4 Merge branch '3.6-rc' of https://github.com/Andi-K/friendica into 3.6-rc Andi 2018-03-22 00:34:38 +01:00
  • e473be01db frio: removed "Illegal string offset" Warnings Andi 2018-03-21 23:53:41 +01:00
  • 7c78a92183 Merge pull request #4644 from annando/event-date rabuzarus 2018-03-21 21:21:26 +01:00
  • e74f186b34 Event: Prevent SQL errors with events without end Michael 2018-03-21 20:16:43 +00:00
  • 046046e0c4 Merge pull request #4640 from MrPetovan/task/4604-add-password-exposed-check Michael Vogel 2018-03-21 18:04:16 +01:00
  • cd7993f869 Use Config wrapper instead of direct config retrieval Hypolite Petovan 2018-03-21 08:54:58 -04:00
  • 6b7f5960dc Merge pull request #4642 from annando/updated-faq Tobias Diekershoff 2018-03-21 08:07:20 +01:00
  • 54405eb6fd Added linebreaks in the FAQ. Michael 2018-03-21 07:01:40 +00:00
  • fd9171a40e Fix egregious whitespace issue in mod/settings Hypolite Petovan 2018-03-21 02:38:04 -04:00
  • 5b4fb945a2 Add htconfig setting to disable password_exposed() Hypolite Petovan 2018-03-21 02:35:28 -04:00
  • 9ec102cf3c Merge pull request #4641 from annando/updated-faq Hypolite Petovan 2018-03-21 02:27:38 -04:00
  • c6d4d416b1 The FAQ had been updated to reflect the latest changes Michael 2018-03-21 06:23:07 +00:00
  • 701fd41463 Rename checkPasswordExposed to isPasswordExposed Hypolite Petovan 2018-03-21 02:14:43 -04:00
  • 6700cce026 6th (magic numbers, addon translations) Tobias Diekershoff 2018-03-21 07:12:46 +01:00
  • ca13570251 Add exposed password check to manual password change Hypolite Petovan 2018-03-21 01:33:35 -04:00
  • d34a92ab2b [Composer] Add divineomega/password_exposed Hypolite Petovan 2018-03-21 01:31:00 -04:00
  • 417239be65 Merge pull request #4638 from annando/incorrect-datetime Hypolite Petovan 2018-03-21 01:24:50 -04:00
  • 73efdb99e3 Fix for incorrect datetime values Michael 2018-03-21 05:20:55 +00:00
  • 8338086746 5th (missing s) Tobias Diekershoff 2018-03-20 19:28:25 +01:00
  • fea9294b77 4th (typos) Tobias Diekershoff 2018-03-20 17:23:51 +01:00
  • 219fba2ac4 3rd (typos) Tobias Diekershoff 2018-03-20 16:17:42 +01:00
  • 530e4d7610 hypolite wants to be MrPetrovan Tobias Diekershoff 2018-03-20 16:12:23 +01:00
  • decebccf4a 2nd (some typos) Tobias Diekershoff 2018-03-20 14:25:35 +01:00
  • 846d97841e 1st draft of 3.6 CHANGELOG Tobias Diekershoff 2018-03-20 12:00:38 +01:00
  • f082f0da4f Merge pull request #4636 from annando/event-diaspora Tobias Diekershoff 2018-03-20 08:48:37 +01:00
  • f4ba5d9799 Fix: Events on Diaspora now should look fine Michael 2018-03-20 06:32:17 +00:00
  • 55614320b4 Merge pull request #4635 from fabrixxm/3.6-rc-it Hypolite Petovan 2018-03-19 16:53:48 -04:00
  • 05552e2a2f Update IT strings fabrixxm 2018-03-19 20:39:19 +01:00
  • 97d31255e5 Merge pull request #4634 from tobiasd/20180319-de Hypolite Petovan 2018-03-19 13:50:37 -04:00
  • 08ed310d83 update for DE translation THX utzer Tobias Diekershoff 2018-03-19 18:38:47 +01:00
  • dca6627682 Merge pull request #4633 from friendica/fabrixxm-36rc-patch-2 Tobias Diekershoff 2018-03-19 15:22:10 +01:00
  • 4d8d5ca6a5 Merge pull request #4630 from MrPetovan/task/4629-move-executable-to-bin Tobias Diekershoff 2018-03-19 15:05:53 +01:00
  • e1423c5342 Merge pull request #4628 from MrPetovan/task/add-console Tobias Diekershoff 2018-03-19 15:04:46 +01:00
  • 9bf58a0612 Fix spelling for "detailed_notif" help text in settings fabrixxm 2018-03-19 13:56:17 +01:00
  • 2295d2aa8a Revert changes to CHANGELOG Hypolite Petovan 2018-03-19 08:46:17 -04:00
  • 7f01ee066c Merge pull request #4631 from friendica/fabrixxm-36rc-patch-1 Hypolite Petovan 2018-03-19 08:39:50 -04:00
  • d9aca508cd Fix another closing bracket in translatable string fabrixxm 2018-03-19 11:19:09 +01:00