Hypolite Petovan
|
3810b483cf
|
Fix undefined Imagick::scaleDown error
|
2017-12-07 23:32:49 -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 |
|
|
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
|
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 |
|
|
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 |
|
|
Hypolite Petovan
|
c566ca74a5
|
Merge pull request #4019 from annando/develop
OnePoll now is called not so often anymore
|
2017-12-06 11:22:30 -05:00 |
|
|
Michael
|
ee52ae4c21
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-12-06 14:56:34 +00:00 |
|
|
Michael
|
f1f222c633
|
Removed unused code
|
2017-12-06 14:30:07 +00:00 |
|
|
Hypolite Petovan
|
f9fd26341e
|
Merge pull request #4017 from annando/remove-unused-stuff
Removed some unused tables and functions
|
2017-12-06 09:26:16 -05:00 |
|
|
Michael
|
ad5c263dbf
|
Reduced "dbclean" calls
|
2017-12-06 14:23:38 +00:00 |
|
|
Michael
|
418365b30e
|
DBClean now runs as long as there are entries to be deleted
|
2017-12-06 14:22:03 +00:00 |
|
|
Michael
|
0fb6150fae
|
Updated database.sql
|
2017-12-05 22:22:21 +00:00 |
|
|
Michael
|
45227a12a6
|
"item_id" and "spam" aren't used
|
2017-12-05 22:20:49 +00:00 |
|
|
Michael
|
583914a548
|
Removed some unused tables and functions
|
2017-12-05 21:54:13 +00:00 |
|
|
Hypolite Petovan
|
75c7dc0fa0
|
Merge pull request #4015 from annando/archive-again
Don't archive "self" contacts
|
2017-12-05 16:38:48 -05:00 |
|
|
Hypolite Petovan
|
2bcc70fa77
|
Merge pull request #4016 from annando/dbclean-conversation
DBClean now works with the conversation table as well
|
2017-12-05 16:37:43 -05:00 |
|
|
Michael
|
9ffde01fc1
|
DBClean now works with the conversation table as well
|
2017-12-05 21:30:38 +00:00 |
|
|
Michael
|
e5c2b7a243
|
Don't archive "self" contacts
|
2017-12-05 21:29:33 +00:00 |
|
|
Hypolite Petovan
|
a4451c7c3d
|
Merge pull request #4011 from annando/archive-cleanup
Some cleanup for archiving/unarchiving contacts
|
2017-12-05 07:47:44 -05:00 |
|
|
Hypolite Petovan
|
88891d9ae1
|
Merge pull request #4012 from zeroadam/OAuth-quickfix
Move OAuth to src: remove index
|
2017-12-05 07:46:59 -05:00 |
|