Hypolite Petovan
f293d2e993
Merge pull request #4667 from Alkarex/fix-bin-console
...
Fix PHP cannot take a shell script
2018-03-24 08:38:29 -04:00
Alexandre Alapetite
e64196c7b3
Fix PHP cannot take a shell script
...
Fix part of https://github.com/friendica/friendica/issues/4665
`php [shell file]` does not work, so use `php [php file]` instead.
`php bin/console.php` is more robust than e.g. `bin/console` which does
not work on Windows, or *nix systems without Bash
2018-03-24 12:47:40 +01:00
Hypolite Petovan
ed93fce743
Merge pull request #4662 from MrPetovan/bug/4660-restore-composer-5.6-compatibility
...
Hotfix: Restore composer 5 6 compatibility
2018-03-23 20:53:52 -04:00
Hypolite Petovan
af4a206d7b
Merge pull request #4661 from MrPetovan/develop
...
Hotfix: Bump database version number after RC merge
2018-03-23 20:53:07 -04:00
Hypolite Petovan
4e33f7f458
Restore executable permissions in bin/
2018-03-23 20:47:58 -04:00
Hypolite Petovan
07a175b29f
[Composer] Downgrade paragonie/constant_time_encoding to PHP 5.6 compatible version
2018-03-23 20:41:55 -04:00
Hypolite Petovan
9abe3dade2
Bump database version number after RC merge
2018-03-23 20:01:53 -04:00
Michael Vogel
96a6c098bc
Merge pull request #4657 from MrPetovan/task/3878-move-event-to-src
...
Move include/event.php to src/
2018-03-23 21:24:20 +01:00
Hypolite Petovan
241ed9a9cd
Merge pull request #4658 from fabrixxm/dev/update-vagrant
...
Edits to Vagrant dev env part 3
2018-03-23 15:40:20 -04:00
fabrixxm
57e6b8ac1a
Dev env: fix cache test data
2018-03-23 18:19:29 +01:00
fabrixxm
3aa015d381
Merge pull request #4651 from MrPetovan/develop
...
Update Develop with 3.6-rc changes
2018-03-23 17:21:35 +01:00
fabrixxm
f05e773a8c
Dev env: fix admin email
2018-03-23 17:16:22 +01:00
Hypolite Petovan
2cd2eff772
Merge pull request #4654 from fabrixxm/dev/update-vagrant
...
Edits to Vagrant dev env - the missing part
2018-03-23 11:49:14 -04:00
fabrixxm
2e69bd95a0
update test data for dev env
2018-03-23 16:38:26 +01:00
Hypolite Petovan
705d1432ce
Merge pull request #4653 from fabrixxm/dev/update-vagrant
...
Edits to Vagrant dev env
2018-03-23 11:23:00 -04:00
fabrixxm
dd37176a01
Fix Vagrant dev env
...
- more consistent use of hostname
- use .local hostname instead of .dev . Looks like Firefox is more
happy with a self-signed certificate on .local than .dev
- add friendica.local to altname in certificate
- run composer install while provisioning
2018-03-23 16:12:11 +01:00
Hypolite Petovan
ecd660cb10
Updated version number
2018-03-23 06:39:51 -04:00
Hypolite Petovan
a7c48f40b7
Enable CalendarExport widget on /events
2018-03-23 06:34:21 -04:00
Hypolite Petovan
c5cd569447
Restore previous permission comment in Widget\CalendarExport
2018-03-23 06:34:21 -04:00
Hypolite Petovan
d36bc29ce9
Finally fix the permissions for Widget\CalendarExport
2018-03-23 06:34:21 -04:00
Hypolite Petovan
95792f6b79
Fix typo in mod/events
...
- Add todo in Model\Event
2018-03-23 06:34:21 -04:00
Hypolite Petovan
72b552895e
Restore missing permission check in Widget\CalendarExport
2018-03-23 06:34:21 -04:00
Hypolite Petovan
254974826f
Fix wrong contact retrieval condition in Event::store
2018-03-23 06:34:21 -04:00
Hypolite Petovan
bc12ba68cd
Fix wrong parameter check in Event::store
2018-03-23 06:34:21 -04:00
Hypolite Petovan
089f556327
Initialize $event in Event::store
2018-03-23 06:34:21 -04:00
Hypolite Petovan
89e9cbb0b5
Remove private key from event array in Event::store
2018-03-23 06:34:21 -04:00
Hypolite Petovan
4eaf0d76b0
Remove include/event
2018-03-23 06:32:34 -04:00
Hypolite Petovan
6e7c6ab0fa
Remove references to include/event
2018-03-23 06:32:34 -04:00
Hypolite Petovan
f7e2071117
Replace include/event function with method calls
...
- Updated scope of Model\Event methods
- Updated use list
2018-03-23 06:32:34 -04:00
Hypolite Petovan
5aecc758f9
Replace include/event function content by method calls
2018-03-23 06:32:34 -04:00
Hypolite Petovan
8c956ac0c8
Add new classes
...
- Add Model\Event class
- Add Content\Widget\CalendarExport class
2018-03-23 06:32:08 -04:00
Hypolite Petovan
27d94023ee
Merge branch 'master' into develop
2018-03-23 06:15:55 -04:00
bacc5de3a2
Friendica version 3.6 - The Tazmans Flax-lily
2018-03-23 07:14:49 +01:00
c845415a99
Merge pull request #4637 from tobiasd/3.6
...
3.6 CHANGELOG
2018-03-23 07:09:54 +01:00
23f7d452a1
2018-03-23 it is
2018-03-23 07:08:56 +01:00
Hypolite Petovan
c01c0681c0
Merge pull request #4650 from annando/url-shorten-ostatus
...
Partly reverted url beautification
2018-03-22 16:54:19 -04:00
dccfc83a2d
No display improvements for regular posts
2018-03-22 20:47:31 +00:00
318de2f590
Merge remote-tracking branch 'upstream/3.6-rc' into url-shorten-ostatus
2018-03-22 20:42:29 +00:00
Hypolite Petovan
c5c0887f59
Merge pull request #4649 from annando/fix-thr-parent
...
Fix: Items with "uid=0" always had the "parent-uri" as "thr-parent"
2018-03-22 12:24:37 -04:00
b171fb1f24
Fix: Items with "uid=0" always had the "parent-uri" as "thr-parent"
2018-03-22 16:18:49 +00:00
cce3030e79
8th (4369 got closed)
2018-03-22 14:20:07 +01:00
67d791df3b
7th (more work on themes and events)
2018-03-22 06:53:58 +01:00
Hypolite Petovan
0d60f1a7d3
Merge pull request #4646 from Andi-K/3.6-rc
...
vier: replace hard coded style paths
2018-03-21 21:12:04 -04:00
Andi
97840abdd6
2018-03-22 01:25:43 +01:00
Andi
1e2820805b
vier: replace hard coded style path
2018-03-22 01:15:59 +01:00
Hypolite Petovan
f3358b7af4
Merge pull request #4645 from Andi-K/3.6-rc
...
frio: removed "Illegal string offset" Warnings
2018-03-21 20:01:01 -04:00
Andi
c69fa859c4
Merge branch '3.6-rc' of https://github.com/Andi-K/friendica into 3.6-rc
2018-03-22 00:34:38 +01:00
Andi
e473be01db
frio: removed "Illegal string offset" Warnings
2018-03-21 23:53:41 +01:00
rabuzarus
7c78a92183
Merge pull request #4644 from annando/event-date
...
Event: Prevent SQL errors with events without end
2018-03-21 21:21:26 +01:00
e74f186b34
Event: Prevent SQL errors with events without end
2018-03-21 20:16:43 +00:00
