bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
17019 commits 4 branches 0 tags 133 MiB
Commit graph

17019 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan 3c2d3d5073
Merge pull request #4040 from tobiasd/20171209-en 
EN US and GB translation updates
 2017-12-08 04:05:00 -05:00
Tobias Diekershoff 6d48f5578d EN US and GB translation updates 2017-12-08 09:42:24 +01:00
Michael Vogel 0ef2425a3e
Merge pull request #4039 from annando/third-4036 
And now for the third bugfix to PR 4036
 2017-12-08 07:35:55 +01:00
Michael 14d4ffbe7a And now for the third bugfix to PR 4036 2017-12-08 06:32:14 +00:00
Michael Vogel 23ca4f92af
Merge pull request #4038 from annando/second-bugfix-4036 
Second bugfix to PR 4036
 2017-12-08 07:19:20 +01:00
Michael 0a946587b5 Second bugfix to PR 4036 2017-12-08 06:15:06 +00:00
Michael Vogel 6287e46650
Merge pull request #4037 from annando/bugfix-4036 
Bugfix to PR 4036
 2017-12-08 06:48:35 +01:00
Michael 79c841a260 Bugfix to PR 4036 2017-12-08 05:44:43 +00:00
Michael Vogel 5ba6c7717a
Merge pull request #4036 from MrPetovan/task/3878-move-objects-to-model 
Move objects to model (redux)
 2017-12-08 06:20:24 +01:00
Hypolite Petovan d3182d93ac Move Object\Profile to Model\Profile 2017-12-07 23:58:20 -05:00
Hypolite Petovan bc58e8d3be Rename Model\GlobalContact to Model\GContact 2017-12-07 23:57:56 -05:00
Hypolite Petovan 3772cf7544 Move Object\Conversation to Object\Thread 
- Move Object\Item to Object\Post
 2017-12-07 23:57:37 -05:00
Hypolite Petovan a42595a30c Move Object\Contact to Model\Contact 2017-12-07 23:56:12 -05:00
Hypolite Petovan 6b60b89385 Move Object\Profile to Model\Profile 2017-12-07 23:55:05 -05:00
Hypolite Petovan 3fc3e67b70 Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 23:54:51 -05:00
Hypolite Petovan 7499824381 Merge branch 'task/3878-move-objects-to-model' of https://github.com/MrPetovan/friendica into task/3878-move-objects-to-model 2017-12-07 23:51:03 -05:00
Hypolite Petovan 79ed1568b6 Fix class Object\Item not found in Object\Post 2017-12-07 23:50:38 -05:00
Hypolite Petovan 4b0f83a12b Finish renaming Object\Item to Object\Post 2017-12-07 23:50:38 -05:00
Hypolite Petovan ee273e6548 Fix class Object\Item not found in Object\Post 2017-12-07 23:36:33 -05:00
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 H 68ac89da58
Update text.php 
Corrected typo
 2017-12-07 14:45:37 +07:00
Andy H 6a6dc08c06
Update dark.css 
revert changes
 2017-12-07 14:42:44 +07:00
Andy H 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