]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoMerge pull request #4039 from annando/third-4036
Michael Vogel [Fri, 8 Dec 2017 06:35:55 +0000 (07:35 +0100)]
Merge pull request #4039 from annando/third-4036

And now for the third bugfix to PR 4036

6 years agoAnd now for the third bugfix to PR 4036
Michael [Fri, 8 Dec 2017 06:32:14 +0000 (06:32 +0000)]
And now for the third bugfix to PR 4036

6 years agoMerge pull request #4038 from annando/second-bugfix-4036
Michael Vogel [Fri, 8 Dec 2017 06:19:20 +0000 (07:19 +0100)]
Merge pull request #4038 from annando/second-bugfix-4036

Second bugfix to PR 4036

6 years agoSecond bugfix to PR 4036
Michael [Fri, 8 Dec 2017 06:15:06 +0000 (06:15 +0000)]
Second bugfix to PR 4036

6 years agoMerge pull request #4037 from annando/bugfix-4036
Michael Vogel [Fri, 8 Dec 2017 05:48:35 +0000 (06:48 +0100)]
Merge pull request #4037 from annando/bugfix-4036

Bugfix to PR 4036

6 years agoBugfix to PR 4036
Michael [Fri, 8 Dec 2017 05:44:43 +0000 (05:44 +0000)]
Bugfix to PR 4036

6 years agoMerge pull request #4036 from MrPetovan/task/3878-move-objects-to-model
Michael Vogel [Fri, 8 Dec 2017 05:20:24 +0000 (06:20 +0100)]
Merge pull request #4036 from MrPetovan/task/3878-move-objects-to-model

Move objects to model (redux)

6 years agoMove Object\Profile to Model\Profile
Hypolite Petovan [Thu, 7 Dec 2017 14:05:35 +0000 (09:05 -0500)]
Move Object\Profile to Model\Profile

6 years agoRename Model\GlobalContact to Model\GContact
Hypolite Petovan [Thu, 7 Dec 2017 14:09:28 +0000 (09:09 -0500)]
Rename Model\GlobalContact to Model\GContact

6 years agoMove Object\Conversation to Object\Thread
Hypolite Petovan [Thu, 7 Dec 2017 14:05:23 +0000 (09:05 -0500)]
Move Object\Conversation to Object\Thread

- Move Object\Item to Object\Post

6 years agoMove Object\Contact to Model\Contact
Hypolite Petovan [Thu, 7 Dec 2017 14:04:24 +0000 (09:04 -0500)]
Move Object\Contact to Model\Contact

6 years agoMove Object\Profile to Model\Profile
Hypolite Petovan [Thu, 7 Dec 2017 13:57:35 +0000 (08:57 -0500)]
Move Object\Profile to Model\Profile

6 years agoSeparate Object\Photo into Model\Photo and Object\Image
Hypolite Petovan [Thu, 7 Dec 2017 13:56:11 +0000 (08:56 -0500)]
Separate Object\Photo into Model\Photo and Object\Image

- Renamed a bunch of functions to shorter or clearer names

6 years agoMerge branch 'task/3878-move-objects-to-model' of https://github.com/MrPetovan/friend...
Hypolite Petovan [Fri, 8 Dec 2017 04:51:03 +0000 (23:51 -0500)]
Merge branch 'task/3878-move-objects-to-model' of https://github.com/MrPetovan/friendica into task/3878-move-objects-to-model

6 years agoFix class Object\Item not found in Object\Post
Hypolite Petovan [Fri, 8 Dec 2017 04:36:33 +0000 (23:36 -0500)]
Fix class Object\Item not found in Object\Post

6 years agoFinish renaming Object\Item to Object\Post
Hypolite Petovan [Fri, 8 Dec 2017 04:33:36 +0000 (23:33 -0500)]
Finish renaming Object\Item to Object\Post

6 years agoFix class Object\Item not found in Object\Post
Hypolite Petovan [Fri, 8 Dec 2017 04:36:33 +0000 (23:36 -0500)]
Fix class Object\Item not found in Object\Post

6 years agoFinish renaming Object\Item to Object\Post
Hypolite Petovan [Fri, 8 Dec 2017 04:33:36 +0000 (23:33 -0500)]
Finish renaming Object\Item to Object\Post

6 years agoFix undefined Imagick::scaleDown error
Hypolite Petovan [Fri, 8 Dec 2017 04:32:49 +0000 (23:32 -0500)]
Fix undefined Imagick::scaleDown error

6 years agoMerge pull request #4035 from friendica/revert-4031-task/3878-move-objects-to-model
Michael Vogel [Fri, 8 Dec 2017 04:24:34 +0000 (05:24 +0100)]
Merge pull request #4035 from friendica/revert-4031-task/3878-move-objects-to-model

Revert "Move Objects to Model"

6 years agoRevert "Move Objects to Model"
Michael Vogel [Fri, 8 Dec 2017 04:21:51 +0000 (05:21 +0100)]
Revert "Move Objects to Model"

6 years agoMerge pull request #4031 from MrPetovan/task/3878-move-objects-to-model
Michael Vogel [Fri, 8 Dec 2017 04:02:21 +0000 (05:02 +0100)]
Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model

Move Objects to Model

6 years agoMerge pull request #4034 from hoergen/develop
Hypolite Petovan [Fri, 8 Dec 2017 01:49:33 +0000 (20:49 -0500)]
Merge pull request #4034 from hoergen/develop

Style buttons, lists, inputs and some cleanup

6 years agoStyle buttons, lists, inputs and some cleanup
hoergen [Fri, 8 Dec 2017 01:16:50 +0000 (02:16 +0100)]
Style buttons, lists, inputs and some cleanup

6 years agoMerge pull request #4033 from annando/diaspora-autofriend
Hypolite Petovan [Thu, 7 Dec 2017 21:12:49 +0000 (16:12 -0500)]
Merge pull request #4033 from annando/diaspora-autofriend

Possible fix for issue 4013

6 years agoCommented out the functionality
Michael [Thu, 7 Dec 2017 20:10:09 +0000 (20:10 +0000)]
Commented out the functionality

6 years agoPossible fix for issue 4013
Michael [Thu, 7 Dec 2017 19:39:55 +0000 (19:39 +0000)]
Possible fix for issue 4013

6 years agoHotfix regmod missing use statement
Hypolite Petovan [Thu, 7 Dec 2017 19:12:03 +0000 (14:12 -0500)]
Hotfix regmod missing use statement

6 years agoMerge pull request #4032 from zeroadam/FrioAdjustment
Hypolite Petovan [Thu, 7 Dec 2017 18:52:15 +0000 (13:52 -0500)]
Merge pull request #4032 from zeroadam/FrioAdjustment

frio: Fix contact template syntax triggering console error

6 years agoTemplete adjustment
Adam Magness [Thu, 7 Dec 2017 14:35:24 +0000 (09:35 -0500)]
Templete adjustment

based on errors that were showing up in the debugger console on chrome

6 years agoRename Model\GlobalContact to Model\GContact
Hypolite Petovan [Thu, 7 Dec 2017 14:09:28 +0000 (09:09 -0500)]
Rename Model\GlobalContact to Model\GContact

6 years agoMove Object\Profile to Model\Profile
Hypolite Petovan [Thu, 7 Dec 2017 14:05:35 +0000 (09:05 -0500)]
Move Object\Profile to Model\Profile

6 years agoMove Object\Conversation to Object\Thread
Hypolite Petovan [Thu, 7 Dec 2017 14:05:23 +0000 (09:05 -0500)]
Move Object\Conversation to Object\Thread

- Move Object\Item to Object\Post

6 years agoMove Object\Contact to Model\Contact
Hypolite Petovan [Thu, 7 Dec 2017 14:04:24 +0000 (09:04 -0500)]
Move Object\Contact to Model\Contact

6 years agoMove Object\Profile to Model\Profile
Hypolite Petovan [Thu, 7 Dec 2017 13:57:35 +0000 (08:57 -0500)]
Move Object\Profile to Model\Profile

6 years agoSeparate Object\Photo into Model\Photo and Object\Image
Hypolite Petovan [Thu, 7 Dec 2017 13:56:11 +0000 (08:56 -0500)]
Separate Object\Photo into Model\Photo and Object\Image

- Renamed a bunch of functions to shorter or clearer names

6 years agoMerge pull request #4024 from MrPetovan/task/remove-unused-db-tables-doc
rabuzarus [Thu, 7 Dec 2017 13:16:45 +0000 (14:16 +0100)]
Merge pull request #4024 from MrPetovan/task/remove-unused-db-tables-doc

Remove unused table documentation

6 years agoMerge pull request #4029 from annando/update-pubkey
Hypolite Petovan [Thu, 7 Dec 2017 12:54:59 +0000 (07:54 -0500)]
Merge pull request #4029 from annando/update-pubkey

Update the public key for public contacts if the key was empty before

6 years agoMerge pull request #4028 from annando/mood2
Hypolite Petovan [Thu, 7 Dec 2017 12:53:46 +0000 (07:53 -0500)]
Merge pull request #4028 from annando/mood2

We've got no mood anymore

6 years agoMerge pull request #4030 from AndyHee/20171207_patch
Michael Vogel [Thu, 7 Dec 2017 09:14:45 +0000 (10:14 +0100)]
Merge pull request #4030 from AndyHee/20171207_patch

Typo

6 years agoUpdate text.php
Andy H3 [Thu, 7 Dec 2017 07:45:37 +0000 (14:45 +0700)]
Update text.php

Corrected typo

6 years agoUpdate dark.css
Andy H3 [Thu, 7 Dec 2017 07:42:44 +0000 (14:42 +0700)]
Update dark.css

revert changes

6 years agoMerge remote-tracking branch 'upstream/develop' into develop
AndyHee [Thu, 7 Dec 2017 07:35:19 +0000 (14:35 +0700)]
Merge remote-tracking branch 'upstream/develop' into develop

6 years agoWe've got no mood anymore
Michael [Thu, 7 Dec 2017 07:01:55 +0000 (07:01 +0000)]
We've got no mood anymore

6 years agoUpdate the public key for public contacts if the key was empty before
Michael [Thu, 7 Dec 2017 06:51:38 +0000 (06:51 +0000)]
Update the public key for public contacts if the key was empty before

6 years agoMerge pull request #4026 from zeroadam/ModRemovals
Michael Vogel [Thu, 7 Dec 2017 06:43:37 +0000 (07:43 +0100)]
Merge pull request #4026 from zeroadam/ModRemovals

Remove mod files

6 years agoMerge pull request #4027 from tobiasd/20171207-lng
Michael Vogel [Thu, 7 Dec 2017 06:37:59 +0000 (07:37 +0100)]
Merge pull request #4027 from tobiasd/20171207-lng

updates for core translation

6 years agoupdate for FR
Tobias Diekershoff [Thu, 7 Dec 2017 06:22:36 +0000 (07:22 +0100)]
update for FR

6 years agoupdate for DE
Tobias Diekershoff [Thu, 7 Dec 2017 06:22:23 +0000 (07:22 +0100)]
update for DE

6 years agoRemove templates
Adam Magness [Thu, 7 Dec 2017 04:44:52 +0000 (23:44 -0500)]
Remove templates

remove associated template files.

6 years agoMerge remote-tracking branch 'upstream/develop' into develop
AndyHee [Thu, 7 Dec 2017 04:28:50 +0000 (11:28 +0700)]
Merge remote-tracking branch 'upstream/develop' into develop

6 years agoRemove obsolete fserver and ffinder db table doc
Hypolite Petovan [Thu, 7 Dec 2017 04:11:06 +0000 (23:11 -0500)]
Remove obsolete fserver and ffinder db table doc

6 years agoMerge pull request #4025 from hoergen/develop
Hypolite Petovan [Thu, 7 Dec 2017 01:15:47 +0000 (20:15 -0500)]
Merge pull request #4025 from hoergen/develop

customized and colored buttons

6 years agocustomized and colored buttons
hoergen [Thu, 7 Dec 2017 00:56:21 +0000 (01:56 +0100)]
customized and colored buttons

6 years agoRemove unused table documentation
Hypolite Petovan [Wed, 6 Dec 2017 23:27:55 +0000 (18:27 -0500)]
Remove unused table documentation

6 years agoRemove mod files
Adam Magness [Wed, 6 Dec 2017 21:45:41 +0000 (16:45 -0500)]
Remove mod files

remove mod files based on lack of usage/obseleteness.

6 years agoMerge pull request #4022 from annando/instances_social
Hypolite Petovan [Wed, 6 Dec 2017 20:36:22 +0000 (15:36 -0500)]
Merge pull request #4022 from annando/instances_social

Retrieve data about Mastodon servers

6 years agoMerge pull request #4021 from zeroadam/ConfigFalse
Hypolite Petovan [Wed, 6 Dec 2017 20:35:43 +0000 (15:35 -0500)]
Merge pull request #4021 from zeroadam/ConfigFalse

Update false evaluations

6 years agoGrammar ...
Michael [Wed, 6 Dec 2017 20:26:33 +0000 (20:26 +0000)]
Grammar ...

6 years agoUse default value
Adam Magness [Wed, 6 Dec 2017 20:25:36 +0000 (15:25 -0500)]
Use default value

use the default value parameter correctly!

6 years agoAdded documentation
Michael [Wed, 6 Dec 2017 20:23:39 +0000 (20:23 +0000)]
Added documentation

6 years agoUndo changes to Feature
Adam Magness [Wed, 6 Dec 2017 20:18:45 +0000 (15:18 -0500)]
Undo changes to Feature

the evaluations were correct before.

6 years agoRetrieve data about Mastodon servers
Michael [Wed, 6 Dec 2017 20:09:59 +0000 (20:09 +0000)]
Retrieve data about Mastodon servers

6 years agoUpdate false evaluations
Adam Magness [Wed, 6 Dec 2017 19:57:06 +0000 (14:57 -0500)]
Update false evaluations

=== false and !== false to is_null where appropriate.

6 years agoMerge pull request #4018 from annando/dbclean
Hypolite Petovan [Wed, 6 Dec 2017 16:53:05 +0000 (11:53 -0500)]
Merge pull request #4018 from annando/dbclean

DBClean now runs as long as there are entries to be deleted

6 years agoCut and paste is always fun
Michael [Wed, 6 Dec 2017 16:50:52 +0000 (16:50 +0000)]
Cut and paste is always fun

6 years agoMerge remote-tracking branch 'upstream/develop' into dbclean
Michael [Wed, 6 Dec 2017 16:49:55 +0000 (16:49 +0000)]
Merge remote-tracking branch 'upstream/develop' into dbclean

6 years agoMerge pull request #4019 from annando/develop
Hypolite Petovan [Wed, 6 Dec 2017 16:22:30 +0000 (11:22 -0500)]
Merge pull request #4019 from annando/develop

OnePoll now is called not so often anymore

6 years agoMerge remote-tracking branch 'upstream/develop' into develop
Michael [Wed, 6 Dec 2017 14:56:34 +0000 (14:56 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop

6 years agoRemoved unused code
Michael [Wed, 6 Dec 2017 14:30:07 +0000 (14:30 +0000)]
Removed unused code

6 years agoMerge pull request #4017 from annando/remove-unused-stuff
Hypolite Petovan [Wed, 6 Dec 2017 14:26:16 +0000 (09:26 -0500)]
Merge pull request #4017 from annando/remove-unused-stuff

Removed some unused tables and functions

6 years agoReduced "dbclean" calls
Michael [Wed, 6 Dec 2017 14:23:38 +0000 (14:23 +0000)]
Reduced "dbclean" calls

6 years agoDBClean now runs as long as there are entries to be deleted
Michael [Wed, 6 Dec 2017 14:22:03 +0000 (14:22 +0000)]
DBClean now runs as long as there are entries to be deleted

6 years agoUpdated database.sql
Michael [Tue, 5 Dec 2017 22:22:21 +0000 (22:22 +0000)]
Updated database.sql

6 years ago"item_id" and "spam" aren't used
Michael [Tue, 5 Dec 2017 22:20:49 +0000 (22:20 +0000)]
"item_id" and "spam" aren't used

6 years agoRemoved some unused tables and functions
Michael [Tue, 5 Dec 2017 21:54:13 +0000 (21:54 +0000)]
Removed some unused tables and functions

6 years agoMerge pull request #4015 from annando/archive-again
Hypolite Petovan [Tue, 5 Dec 2017 21:38:48 +0000 (16:38 -0500)]
Merge pull request #4015 from annando/archive-again

Don't archive "self" contacts

6 years agoMerge pull request #4016 from annando/dbclean-conversation
Hypolite Petovan [Tue, 5 Dec 2017 21:37:43 +0000 (16:37 -0500)]
Merge pull request #4016 from annando/dbclean-conversation

DBClean now works with the conversation table as well

6 years agoDBClean now works with the conversation table as well
Michael [Tue, 5 Dec 2017 21:30:38 +0000 (21:30 +0000)]
DBClean now works with the conversation table as well

6 years agoDon't archive "self" contacts
Michael [Tue, 5 Dec 2017 21:29:33 +0000 (21:29 +0000)]
Don't archive "self" contacts

6 years agoMerge pull request #4011 from annando/archive-cleanup
Hypolite Petovan [Tue, 5 Dec 2017 12:47:44 +0000 (07:47 -0500)]
Merge pull request #4011 from annando/archive-cleanup

Some cleanup for archiving/unarchiving contacts

6 years agoMerge pull request #4012 from zeroadam/OAuth-quickfix
Hypolite Petovan [Tue, 5 Dec 2017 12:46:59 +0000 (07:46 -0500)]
Merge pull request #4012 from zeroadam/OAuth-quickfix

Move OAuth to src: remove index

6 years agoremove index
Adam Magness [Tue, 5 Dec 2017 11:58:57 +0000 (06:58 -0500)]
remove index

remove unneeded index

6 years agoOne tab too much
Michael [Tue, 5 Dec 2017 09:34:43 +0000 (09:34 +0000)]
One tab too much

6 years agoSome cleanup for archiving/unarchiving contacts
Michael [Tue, 5 Dec 2017 07:08:20 +0000 (07:08 +0000)]
Some cleanup for archiving/unarchiving contacts

6 years agoMerge pull request #4010 from tobiasd/20171205-chmod
Michael Vogel [Tue, 5 Dec 2017 06:49:13 +0000 (07:49 +0100)]
Merge pull request #4010 from tobiasd/20171205-chmod

correction of lintian reported (non)script permissions

6 years agoanother -x
Tobias Diekershoff [Tue, 5 Dec 2017 06:26:02 +0000 (07:26 +0100)]
another -x

6 years agoadded some x permissions to scripts
Tobias Diekershoff [Tue, 5 Dec 2017 06:21:21 +0000 (07:21 +0100)]
added some x permissions to scripts

6 years agoremoved x-permission
Tobias Diekershoff [Tue, 5 Dec 2017 06:13:55 +0000 (07:13 +0100)]
removed x-permission

6 years agoMerge pull request #4009 from zeroadam/OAuth-hotfix
Hypolite Petovan [Tue, 5 Dec 2017 02:32:52 +0000 (21:32 -0500)]
Merge pull request #4009 from zeroadam/OAuth-hotfix

OAuth hotfix

6 years agoMore use
Adam Magness [Tue, 5 Dec 2017 02:18:48 +0000 (21:18 -0500)]
More use

more missing use

6 years agoUse statement
Adam Magness [Tue, 5 Dec 2017 02:13:58 +0000 (21:13 -0500)]
Use statement

missing use

6 years agoNon Static calls
Adam Magness [Tue, 5 Dec 2017 02:10:54 +0000 (21:10 -0500)]
Non Static calls

update calls to non static

6 years agoStatic
Adam Magness [Tue, 5 Dec 2017 02:03:39 +0000 (21:03 -0500)]
Static

6 years agoStatic
Adam Magness [Tue, 5 Dec 2017 02:00:47 +0000 (21:00 -0500)]
Static

remove static

6 years agoUse statement
Adam Magness [Tue, 5 Dec 2017 01:30:10 +0000 (20:30 -0500)]
Use statement

6 years agoMerge pull request #4008 from zeroadam/Oauth-#3878
Hypolite Petovan [Mon, 4 Dec 2017 23:33:01 +0000 (18:33 -0500)]
Merge pull request #4008 from zeroadam/Oauth-#3878

OAuth to src

6 years agoUpdate use
Adam Magness [Mon, 4 Dec 2017 23:30:18 +0000 (18:30 -0500)]
Update use

Forgot to update a use statement.

6 years agoReview
Adam Magness [Mon, 4 Dec 2017 21:33:10 +0000 (16:33 -0500)]
Review

updates based on review.

6 years agoMove to Network
Adam Magness [Mon, 4 Dec 2017 20:59:21 +0000 (15:59 -0500)]
Move to Network

Move to network namespace. Get rid of q() and try to get used to [ ] instead of array()