Commit Graph

17270 Commits

Author SHA1 Message Date
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
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
Adam Magness 22a3c7ad7d remove index
remove unneeded index
2017-12-05 06:58:57 -05:00
Michael 115d71e841 One tab too much 2017-12-05 09:34:43 +00:00
Michael 5f9e87ea5a Some cleanup for archiving/unarchiving contacts 2017-12-05 07:08:20 +00:00
Michael Vogel 12ab38f417
Merge pull request #4010 from tobiasd/20171205-chmod
correction of lintian reported (non)script permissions
2017-12-05 07:49:13 +01:00
Tobias Diekershoff db4d44748b another -x 2017-12-05 07:26:02 +01:00
Tobias Diekershoff e614022634 added some x permissions to scripts 2017-12-05 07:21:21 +01:00
Tobias Diekershoff c258df0f0a removed x-permission 2017-12-05 07:13:55 +01:00
Hypolite Petovan 82df294e31
Merge pull request #4009 from zeroadam/OAuth-hotfix
OAuth hotfix
2017-12-04 21:32:52 -05:00
Adam Magness e32b4ed670 More use
more missing use
2017-12-04 21:18:48 -05:00
Adam Magness f1a5560804 Use statement
missing use
2017-12-04 21:13:58 -05:00
Adam Magness 0c48b4188b Non Static calls
update calls to non static
2017-12-04 21:10:54 -05:00
Adam Magness e997128c9f Static 2017-12-04 21:03:39 -05:00
Adam Magness 448598495c Static
remove static
2017-12-04 21:00:47 -05:00
Adam Magness 9f4be62d3d Use statement 2017-12-04 20:30:10 -05:00
Hypolite Petovan 072edc1949
Merge pull request #4008 from zeroadam/Oauth-#3878
OAuth to src
2017-12-04 18:33:01 -05:00