friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
18,574 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

944 Commits

Author SHA1 Message Date
Michael Vogel bfc2bda9b6
Merge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding 
Move suppress_tags config usage to template
 2018-03-25 22:26:17 +02:00
Michael dece06c571 Bugfix: Prevent "Uncaught TypeError: Argument 1 passed to Friendica\Model\Event::formatListForExport() must be of the type array, object given" 2018-03-25 18:56:35 +00:00
Michael 402c0fc770 Using the default avatar when no avatar was found for the self contact 2018-03-25 17:26:40 +00:00
Hypolite Petovan 30113dd6ef
Merge pull request #4683 from annando/update-self 
The "self" contact is now updated at a central place
 2018-03-25 09:25:10 -04:00
Michael Vogel 2c00e3ad36
Merge pull request #4680 from MrPetovan/bug/4669-check-getInfoFromURL-parameter 
Check Image::getInfoFromURL parameter
 2018-03-25 10:39:17 +02:00
Michael ad3e4b894e Update the public contact 2018-03-25 08:20:13 +00:00
Michael abb49150db Update the avatar 2018-03-25 08:15:22 +00:00
Hypolite Petovan daffc27061 Move suppress_tags config to template 
- Add new item.suppress_tags template variable
- Fix template formatting
 2018-03-25 00:38:23 -04:00
Hypolite Petovan 09f04c1985 Add Image::getInfoFromURL return check 2018-03-24 20:03:55 -04:00
Hypolite Petovan 13f58abe05 Add parameter check in Image::getInfoFromURL 2018-03-24 20:03:28 -04:00
Michael a0451e1c62 Merge remote-tracking branch 'upstream/develop' into update-self 2018-03-24 22:50:14 +00:00
Michael e8e6436f08 Issue 4673: Avoid "Incorrect date value: '0000-00-00' for column 'bd'" 2018-03-24 22:27:04 +00:00
Hypolite Petovan bcf9fa147e
Merge pull request #4678 from annando/issue-4666 
Fix: No "not null" when text is replaced by varchar
 2018-03-24 18:09:21 -04:00
Michael 5bca333bf0 Fix: No "not null" when text is replaced by varchar 2018-03-24 21:57:50 +00:00
Hypolite Petovan 11e68b70bb Fix number constant used in Console\PoToPhp 2018-03-24 16:09:19 -04:00
Hypolite Petovan 91eb644743 Fix formatting in Console\PoToPhp 2018-03-24 16:08:56 -04:00
Hypolite Petovan 641bd5eaa6
Merge pull request #4674 from annando/acl-fix 
Fix the ACL problem issue 4616
 2018-03-24 15:48:02 -04:00
Michael 341499e8ca standards 2018-03-24 19:40:35 +00:00
Hypolite Petovan 7acb4b0434
Merge pull request #4676 from annando/clean-url 
Handle URL with unicode characters
 2018-03-24 15:31:07 -04:00
Hypolite Petovan 9665f4ed41
Merge pull request #4675 from annando/group-delete 
Fix: Groups can now be deleted again
 2018-03-24 15:25:26 -04:00
Michael 324baa6b8b Removed test code 2018-03-24 18:48:40 +00:00
Michael 850d9b4c0b Line feeds fixed, not change in functionality 2018-03-24 18:39:13 +00:00
Michael 885d794958 Fix ACL data 2018-03-24 18:38:05 +00:00
Michael 07a1796e8f Fix: Groups can now be deleted again 2018-03-24 07:26:57 +00:00
Michael bac60164e7 New function to keep the self contact updated 2018-03-24 06:15:18 +00:00
Michael 055855bf9b Handle URL with unicode characters 2018-03-23 18:41:59 +00: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 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 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
Michael dccfc83a2d No display improvements for regular posts 2018-03-22 20:47:31 +00:00
Michael 318de2f590 Merge remote-tracking branch 'upstream/3.6-rc' into url-shorten-ostatus 2018-03-22 20:42:29 +00:00
Michael b171fb1f24 Fix: Items with "uid=0" always had the "parent-uri" as "thr-parent" 2018-03-22 16:18:49 +00:00
Hypolite Petovan 701fd41463 Rename checkPasswordExposed to isPasswordExposed 2018-03-21 02:14:43 -04:00
Hypolite Petovan ca13570251 Add exposed password check to manual password change 2018-03-21 01:33:35 -04:00
Michael 73efdb99e3 Fix for incorrect datetime values 2018-03-21 05:20:55 +00:00
Michael f4ba5d9799 Fix: Events on Diaspora now should look fine 2018-03-20 06:32:17 +00: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
Hypolite Petovan d83491ae59 Remove util/global_community_silence 
- Update wrong comment block for Console\Maintenance
 2018-03-18 23:40:06 -04:00
Hypolite Petovan 3b75ea0028 Remove util/config* 
- Update Console\Config help text
 2018-03-18 23:36:24 -04:00
Hypolite Petovan 1c2deac7e5 Move scripts/worker.php to bin/ 2018-03-18 23:25:21 -04:00
Hypolite Petovan 542ff9b082 Move scripts/auth_ejabberd.php to bin/ 2018-03-18 23:17:31 -04:00