Commit graph

17150 commits

Author SHA1 Message Date
Hypolite Petovan
d50d693fe3 Finish renaming Object\Item to Object\Post 2017-12-07 23:33:36 -05:00
Hypolite Petovan
3810b483cf Fix undefined Imagick::scaleDown error 2017-12-07 23:32:49 -05:00
Michael Vogel
0dce57d400
Merge pull request #4035 from friendica/revert-4031-task/3878-move-objects-to-model
Revert "Move Objects to Model"
2017-12-08 05:24:34 +01:00
Michael Vogel
5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Michael Vogel
e437c74d0e
Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model
Move Objects to Model
2017-12-08 05:02:21 +01:00
Hypolite Petovan
b0c7cc0211
Merge pull request #4034 from hoergen/develop
Style buttons, lists, inputs and some cleanup
2017-12-07 20:49:33 -05:00
hoergen
0e2355039f Style buttons, lists, inputs and some cleanup 2017-12-08 02:16:50 +01:00
Hypolite Petovan
16140c8f9f
Merge pull request #4033 from annando/diaspora-autofriend
Possible fix for issue 4013
2017-12-07 16:12:49 -05:00
Michael
a7b004a727 Commented out the functionality 2017-12-07 20:10:09 +00:00
Michael
3824ad5590 Possible fix for issue 4013 2017-12-07 19:39:55 +00:00
Hypolite Petovan
cf45e8738c
Hotfix regmod missing use statement 2017-12-07 14:12:03 -05:00
Hypolite Petovan
05f97e95e7
Merge pull request #4032 from zeroadam/FrioAdjustment
frio: Fix contact template syntax triggering console error
2017-12-07 13:52:15 -05:00
Adam Magness
48367220b8 Templete adjustment
based on errors that were showing up in the debugger console on chrome
2017-12-07 09:35:24 -05:00
Hypolite Petovan
cd84bf8963 Rename Model\GlobalContact to Model\GContact 2017-12-07 09:09:28 -05:00
Hypolite Petovan
294689bf94 Move Object\Profile to Model\Profile 2017-12-07 09:05:35 -05:00
Hypolite Petovan
70d047ba8e Move Object\Conversation to Object\Thread
- Move Object\Item to Object\Post
2017-12-07 09:05:23 -05:00
Hypolite Petovan
18d93cddf6 Move Object\Contact to Model\Contact 2017-12-07 09:04:24 -05:00
Hypolite Petovan
d4ca30a6db Move Object\Profile to Model\Profile 2017-12-07 08:57:35 -05:00
Hypolite Petovan
52bddd580c Separate Object\Photo into Model\Photo and Object\Image
- Renamed a bunch of functions to shorter or clearer names
2017-12-07 08:56:11 -05:00
rabuzarus
54810f6417
Merge pull request #4024 from MrPetovan/task/remove-unused-db-tables-doc
Remove unused table documentation
2017-12-07 14:16:45 +01:00
Hypolite Petovan
70597eb67a
Merge pull request #4029 from annando/update-pubkey
Update the public key for public contacts if the key was empty before
2017-12-07 07:54:59 -05:00
Hypolite Petovan
1cdee234f7
Merge pull request #4028 from annando/mood2
We've got no mood anymore
2017-12-07 07:53:46 -05:00
Michael Vogel
eb74be9ccc
Merge pull request #4030 from AndyHee/20171207_patch
Typo
2017-12-07 10:14:45 +01:00
Andy H3
68ac89da58
Update text.php
Corrected typo
2017-12-07 14:45:37 +07:00
Andy H3
6a6dc08c06
Update dark.css
revert changes
2017-12-07 14:42:44 +07:00
AndyHee
b21703f778 Merge remote-tracking branch 'upstream/develop' into develop 2017-12-07 14:35:19 +07:00
Michael
0608efc38a We've got no mood anymore 2017-12-07 07:01:55 +00:00
Michael
6510df4b51 Update the public key for public contacts if the key was empty before 2017-12-07 06:51:38 +00:00
Michael Vogel
2a55cf2a3d
Merge pull request #4026 from zeroadam/ModRemovals
Remove mod files
2017-12-07 07:43:37 +01:00
Michael Vogel
e9c1224370
Merge pull request #4027 from tobiasd/20171207-lng
updates for core translation
2017-12-07 07:37:59 +01:00
Tobias Diekershoff
8c08f19ad6 update for FR 2017-12-07 07:22:36 +01:00
Tobias Diekershoff
8fad959d74 update for DE 2017-12-07 07:22:23 +01:00
Adam Magness
8bbfc44d47 Remove templates
remove associated template files.
2017-12-06 23:44:52 -05:00
AndyHee
6d3ced6389 Merge remote-tracking branch 'upstream/develop' into develop 2017-12-07 11:28:50 +07:00
Hypolite Petovan
eeee65136c Remove obsolete fserver and ffinder db table doc 2017-12-06 23:11:06 -05:00
Hypolite Petovan
84bb076683
Merge pull request #4025 from hoergen/develop
customized and colored buttons
2017-12-06 20:15:47 -05:00
hoergen
90292d761d customized and colored buttons 2017-12-07 01:56:21 +01:00
Hypolite Petovan
fe93029914 Remove unused table documentation 2017-12-06 18:27:55 -05:00
Adam Magness
3772a1c24c Remove mod files
remove mod files based on lack of usage/obseleteness.
2017-12-06 16:45:41 -05:00
Hypolite Petovan
311af3e544
Merge pull request #4022 from annando/instances_social
Retrieve data about Mastodon servers
2017-12-06 15:36:22 -05:00
Hypolite Petovan
b9387c0a63
Merge pull request #4021 from zeroadam/ConfigFalse
Update false evaluations
2017-12-06 15:35:43 -05:00
Michael
4268f42412 Grammar ... 2017-12-06 20:26:33 +00:00
Adam Magness
71911a6989 Use default value
use the default value parameter correctly!
2017-12-06 15:25:36 -05:00
Michael
e272a5b847 Added documentation 2017-12-06 20:23:39 +00:00
Adam Magness
3e5a518591 Undo changes to Feature
the evaluations were correct before.
2017-12-06 15:18:45 -05:00
Michael
925c03fda8 Retrieve data about Mastodon servers 2017-12-06 20:09:59 +00:00
Adam Magness
cadfef63c4 Update false evaluations
=== false and !== false to is_null where appropriate.
2017-12-06 14:57:06 -05:00
Hypolite Petovan
09d798ba77
Merge pull request #4018 from annando/dbclean
DBClean now runs as long as there are entries to be deleted
2017-12-06 11:53:05 -05:00
Michael
7099a54b3d Cut and paste is always fun 2017-12-06 16:50:52 +00:00
Michael
4bf425de5d Merge remote-tracking branch 'upstream/develop' into dbclean 2017-12-06 16:49:55 +00:00