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 |
|
Michael Vogel
|
046046e0c4
|
Merge pull request #4640 from MrPetovan/task/4604-add-password-exposed-check
Add password exposed check
|
2018-03-21 18:04:16 +01:00 |
|
Hypolite Petovan
|
cd7993f869
|
Use Config wrapper instead of direct config retrieval
|
2018-03-21 08:54:58 -04:00 |
|
|
6b7f5960dc
|
Merge pull request #4642 from annando/updated-faq
Added linebreaks in the FAQ.
|
2018-03-21 08:07:20 +01:00 |
|
|
54405eb6fd
|
Added linebreaks in the FAQ.
|
2018-03-21 07:01:40 +00:00 |
|
Hypolite Petovan
|
fd9171a40e
|
Fix egregious whitespace issue in mod/settings
|
2018-03-21 02:38:04 -04:00 |
|
Hypolite Petovan
|
5b4fb945a2
|
Add htconfig setting to disable password_exposed()
|
2018-03-21 02:35:28 -04:00 |
|
Hypolite Petovan
|
9ec102cf3c
|
Merge pull request #4641 from annando/updated-faq
The FAQ had been updated to reflect the latest changes
|
2018-03-21 02:27:38 -04:00 |
|
|
c6d4d416b1
|
The FAQ had been updated to reflect the latest changes
|
2018-03-21 06:23:07 +00:00 |
|
Hypolite Petovan
|
701fd41463
|
Rename checkPasswordExposed to isPasswordExposed
|
2018-03-21 02:14:43 -04:00 |
|
|
6700cce026
|
6th (magic numbers, addon translations)
|
2018-03-21 07:12:46 +01:00 |
|
Hypolite Petovan
|
ca13570251
|
Add exposed password check to manual password change
|
2018-03-21 01:33:35 -04:00 |
|
Hypolite Petovan
|
d34a92ab2b
|
[Composer] Add divineomega/password_exposed
- Reorder PHP packages by alphabetical order
|
2018-03-21 01:31:00 -04:00 |
|
Hypolite Petovan
|
417239be65
|
Merge pull request #4638 from annando/incorrect-datetime
Fix for incorrect datetime values
|
2018-03-21 01:24:50 -04:00 |
|
|
73efdb99e3
|
Fix for incorrect datetime values
|
2018-03-21 05:20:55 +00:00 |
|
|
8338086746
|
5th (missing s)
|
2018-03-20 19:28:25 +01:00 |
|
|
fea9294b77
|
4th (typos)
|
2018-03-20 17:23:51 +01:00 |
|
|
219fba2ac4
|
3rd (typos)
|
2018-03-20 16:17:42 +01:00 |
|
|
530e4d7610
|
hypolite wants to be MrPetrovan
|
2018-03-20 16:12:23 +01:00 |
|
|
decebccf4a
|
2nd (some typos)
|
2018-03-20 14:25:35 +01:00 |
|
|
846d97841e
|
1st draft of 3.6 CHANGELOG
|
2018-03-20 12:00:38 +01:00 |
|
|
f082f0da4f
|
Merge pull request #4636 from annando/event-diaspora
Fix: Events on Diaspora now should look fine
|
2018-03-20 08:48:37 +01:00 |
|
|
f4ba5d9799
|
Fix: Events on Diaspora now should look fine
|
2018-03-20 06:32:17 +00:00 |
|
Hypolite Petovan
|
55614320b4
|
Merge pull request #4635 from fabrixxm/3.6-rc-it
Update IT strings
|
2018-03-19 16:53:48 -04:00 |
|
fabrixxm
|
05552e2a2f
|
Update IT strings
|
2018-03-19 20:39:19 +01:00 |
|
Hypolite Petovan
|
97d31255e5
|
Merge pull request #4634 from tobiasd/20180319-de
update for DE translation THX utzer
|
2018-03-19 13:50:37 -04:00 |
|
|
08ed310d83
|
update for DE translation THX utzer
|
2018-03-19 18:38:47 +01:00 |
|
|
dca6627682
|
Merge pull request #4633 from friendica/fabrixxm-36rc-patch-2
Small fixes and spelling
|
2018-03-19 15:22:10 +01:00 |
|
|
4d8d5ca6a5
|
Merge pull request #4630 from MrPetovan/task/4629-move-executable-to-bin
Move executable scripts to bin/ (part 1)
|
2018-03-19 15:05:53 +01:00 |
|
|
e1423c5342
|
Merge pull request #4628 from MrPetovan/task/add-console
Add Friendica console part 2: Script removal
|
2018-03-19 15:04:46 +01:00 |
|
fabrixxm
|
9bf58a0612
|
Fix spelling for "detailed_notif" help text in settings
|
2018-03-19 13:56:17 +01:00 |
|
Hypolite Petovan
|
2295d2aa8a
|
Revert changes to CHANGELOG
|
2018-03-19 08:46:17 -04:00 |
|