Commit graph

18843 commits

Author SHA1 Message Date
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
Michael 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
Tobias Diekershoff 6b7f5960dc
Merge pull request #4642 from annando/updated-faq
Added linebreaks in the FAQ.
2018-03-21 08:07:20 +01:00
Michael 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
Michael 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
Tobias Diekershoff 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
Michael 73efdb99e3 Fix for incorrect datetime values 2018-03-21 05:20:55 +00:00
Tobias Diekershoff 8338086746 5th (missing s) 2018-03-20 19:28:25 +01:00
Tobias Diekershoff fea9294b77 4th (typos) 2018-03-20 17:23:51 +01:00
Tobias Diekershoff 219fba2ac4 3rd (typos) 2018-03-20 16:17:42 +01:00
Tobias Diekershoff 530e4d7610 hypolite wants to be MrPetrovan 2018-03-20 16:12:23 +01:00
Tobias Diekershoff decebccf4a 2nd (some typos) 2018-03-20 14:25:35 +01:00
Tobias Diekershoff 846d97841e 1st draft of 3.6 CHANGELOG 2018-03-20 12:00:38 +01:00
Tobias Diekershoff 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
Michael 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
Tobias Diekershoff 08ed310d83 update for DE translation THX utzer 2018-03-19 18:38:47 +01:00
Tobias Diekershoff dca6627682
Merge pull request #4633 from friendica/fabrixxm-36rc-patch-2
Small fixes and spelling
2018-03-19 15:22:10 +01:00
Tobias Diekershoff 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
Tobias Diekershoff 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
Hypolite Petovan 7f01ee066c
Merge pull request #4631 from friendica/fabrixxm-36rc-patch-1
Small fix to translatable string
2018-03-19 08:39:50 -04:00
fabrixxm d9aca508cd
Fix another closing bracket in translatable string 2018-03-19 11:19:09 +01:00
fabrixxm e6c59b0593
fix docstring of get_poke_verbs() 2018-03-19 10:20:01 +01:00
fabrixxm 8a2a4510ec
Small fixes to translatable string
and some small cosmetic fixup to docstring for `notification()`
2018-03-19 10:15:09 +01:00
Hypolite Petovan e837f6fff9 Revert changes to the CHANGELOG 2018-03-19 02:16:05 -04:00
Hypolite Petovan 132456697c Remove scripts/dbstructure
- Updated documentation
2018-03-18 23:53:53 -04:00
Hypolite Petovan 4622f42b1d Remove util/typo
- Updated documentation
- Fixed typo in documenation
2018-03-18 23:52:07 -04:00
Hypolite Petovan 05b6cf7559 Remove util/extract
- Updated documentation
2018-03-18 23:49:45 -04:00
Hypolite Petovan 2226ed2949 Remove util/po2php
- Updated documentation
2018-03-18 23:47:38 -04:00
Hypolite Petovan 2b2c676eca Remove util/php2po
- Updated util/README
2018-03-18 23:44:27 -04:00
Hypolite Petovan f6fcda2781 Remove util/maintenance 2018-03-18 23:40:56 -04:00
Hypolite Petovan d83491ae59 Remove util/global_community_silence
- Update wrong comment block for Console\Maintenance
2018-03-18 23:40:06 -04:00