clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 7499824381 Merge branch 'task/3878-move-objects-to-model' of https://github.com/MrPetovan/friendica into task/3878-move-objects-to-model Hypolite Petovan 2017-12-07 23:51:03 -05:00
  • 79ed1568b6 Fix class Object\Item not found in Object\Post Hypolite Petovan 2017-12-07 23:36:33 -05:00
  • 4b0f83a12b Finish renaming Object\Item to Object\Post Hypolite Petovan 2017-12-07 23:33:36 -05:00
  • ee273e6548 Fix class Object\Item not found in Object\Post Hypolite Petovan 2017-12-07 23:36:33 -05:00
  • d50d693fe3 Finish renaming Object\Item to Object\Post Hypolite Petovan 2017-12-07 23:33:36 -05:00
  • 3810b483cf Fix undefined Imagick::scaleDown error Hypolite Petovan 2017-12-07 23:32:49 -05:00
  • 0dce57d400 Merge pull request #4035 from friendica/revert-4031-task/3878-move-objects-to-model Michael Vogel 2017-12-08 05:24:34 +01:00
  • 5747cfc79c Revert "Move Objects to Model" Michael Vogel 2017-12-08 05:21:51 +01:00
  • e437c74d0e Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model Michael Vogel 2017-12-08 05:02:21 +01:00
  • b0c7cc0211 Merge pull request #4034 from hoergen/develop Hypolite Petovan 2017-12-07 20:49:33 -05:00
  • 0e2355039f Style buttons, lists, inputs and some cleanup hoergen 2017-12-08 02:16:50 +01:00
  • 16140c8f9f Merge pull request #4033 from annando/diaspora-autofriend Hypolite Petovan 2017-12-07 16:12:49 -05:00
  • a7b004a727 Commented out the functionality Michael 2017-12-07 20:10:09 +00:00
  • 3824ad5590 Possible fix for issue 4013 Michael 2017-12-07 19:39:55 +00:00
  • cf45e8738c Hotfix regmod missing use statement Hypolite Petovan 2017-12-07 14:12:03 -05:00
  • 05f97e95e7 Merge pull request #4032 from zeroadam/FrioAdjustment Hypolite Petovan 2017-12-07 13:52:15 -05:00
  • 48367220b8 Templete adjustment Adam Magness 2017-12-07 09:35:24 -05:00
  • cd84bf8963 Rename Model\GlobalContact to Model\GContact Hypolite Petovan 2017-12-07 09:09:28 -05:00
  • 294689bf94 Move Object\Profile to Model\Profile Hypolite Petovan 2017-12-07 09:05:35 -05:00
  • 70d047ba8e Move Object\Conversation to Object\Thread Hypolite Petovan 2017-12-07 09:05:23 -05:00
  • 18d93cddf6 Move Object\Contact to Model\Contact Hypolite Petovan 2017-12-07 09:04:24 -05:00
  • d4ca30a6db Move Object\Profile to Model\Profile Hypolite Petovan 2017-12-07 08:57:35 -05:00
  • 52bddd580c Separate Object\Photo into Model\Photo and Object\Image Hypolite Petovan 2017-12-07 08:56:11 -05:00
  • 54810f6417 Merge pull request #4024 from MrPetovan/task/remove-unused-db-tables-doc rabuzarus 2017-12-07 14:16:45 +01:00
  • 70597eb67a Merge pull request #4029 from annando/update-pubkey Hypolite Petovan 2017-12-07 07:54:59 -05:00
  • 1cdee234f7 Merge pull request #4028 from annando/mood2 Hypolite Petovan 2017-12-07 07:53:46 -05:00
  • eb74be9ccc Merge pull request #4030 from AndyHee/20171207_patch Michael Vogel 2017-12-07 10:14:45 +01:00
  • 68ac89da58 Update text.php Andy H3 2017-12-07 14:45:37 +07:00
  • 6a6dc08c06 Update dark.css Andy H3 2017-12-07 14:42:44 +07:00
  • b21703f778 Merge remote-tracking branch 'upstream/develop' into develop AndyHee 2017-12-07 14:35:19 +07:00
  • 0608efc38a We've got no mood anymore Michael 2017-12-07 07:01:55 +00:00
  • 6510df4b51 Update the public key for public contacts if the key was empty before Michael 2017-12-07 06:51:38 +00:00
  • 2a55cf2a3d Merge pull request #4026 from zeroadam/ModRemovals Michael Vogel 2017-12-07 07:43:37 +01:00
  • e9c1224370 Merge pull request #4027 from tobiasd/20171207-lng Michael Vogel 2017-12-07 07:37:59 +01:00
  • 8c08f19ad6 update for FR Tobias Diekershoff 2017-12-07 07:22:36 +01:00
  • 8fad959d74 update for DE Tobias Diekershoff 2017-12-07 07:22:23 +01:00
  • 8bbfc44d47 Remove templates Adam Magness 2017-12-06 23:44:52 -05:00
  • 6d3ced6389 Merge remote-tracking branch 'upstream/develop' into develop AndyHee 2017-12-07 11:28:50 +07:00
  • eeee65136c Remove obsolete fserver and ffinder db table doc Hypolite Petovan 2017-12-06 23:11:06 -05:00
  • 84bb076683 Merge pull request #4025 from hoergen/develop Hypolite Petovan 2017-12-06 20:15:47 -05:00
  • 90292d761d customized and colored buttons hoergen 2017-12-07 01:56:21 +01:00
  • fe93029914 Remove unused table documentation Hypolite Petovan 2017-12-06 18:27:55 -05:00
  • 3772a1c24c Remove mod files Adam Magness 2017-12-06 16:45:41 -05:00
  • 311af3e544 Merge pull request #4022 from annando/instances_social Hypolite Petovan 2017-12-06 15:36:22 -05:00
  • b9387c0a63 Merge pull request #4021 from zeroadam/ConfigFalse Hypolite Petovan 2017-12-06 15:35:43 -05:00
  • 4268f42412 Grammar ... Michael 2017-12-06 20:26:33 +00:00
  • 71911a6989 Use default value Adam Magness 2017-12-06 15:25:36 -05:00
  • e272a5b847 Added documentation Michael 2017-12-06 20:23:39 +00:00
  • 3e5a518591 Undo changes to Feature Adam Magness 2017-12-06 15:18:45 -05:00
  • 925c03fda8 Retrieve data about Mastodon servers Michael 2017-12-06 20:09:59 +00:00
  • cadfef63c4 Update false evaluations Adam Magness 2017-12-06 14:57:06 -05:00
  • 09d798ba77 Merge pull request #4018 from annando/dbclean Hypolite Petovan 2017-12-06 11:53:05 -05:00
  • 7099a54b3d Cut and paste is always fun Michael 2017-12-06 16:50:52 +00:00
  • 4bf425de5d Merge remote-tracking branch 'upstream/develop' into dbclean Michael 2017-12-06 16:49:55 +00:00
  • c566ca74a5 Merge pull request #4019 from annando/develop Hypolite Petovan 2017-12-06 11:22:30 -05:00
  • ee52ae4c21 Merge remote-tracking branch 'upstream/develop' into develop Michael 2017-12-06 14:56:34 +00:00
  • f1f222c633 Removed unused code Michael 2017-12-06 14:30:07 +00:00
  • f9fd26341e Merge pull request #4017 from annando/remove-unused-stuff Hypolite Petovan 2017-12-06 09:26:16 -05:00
  • ad5c263dbf Reduced "dbclean" calls Michael 2017-12-06 14:23:38 +00:00
  • 418365b30e DBClean now runs as long as there are entries to be deleted Michael 2017-12-06 14:22:03 +00:00
  • 0fb6150fae Updated database.sql Michael 2017-12-05 22:22:21 +00:00
  • 45227a12a6 "item_id" and "spam" aren't used Michael 2017-12-05 22:20:49 +00:00
  • 583914a548 Removed some unused tables and functions Michael 2017-12-05 21:54:13 +00:00
  • 75c7dc0fa0 Merge pull request #4015 from annando/archive-again Hypolite Petovan 2017-12-05 16:38:48 -05:00
  • 2bcc70fa77 Merge pull request #4016 from annando/dbclean-conversation Hypolite Petovan 2017-12-05 16:37:43 -05:00
  • 9ffde01fc1 DBClean now works with the conversation table as well Michael 2017-12-05 21:30:38 +00:00
  • e5c2b7a243 Don't archive "self" contacts Michael 2017-12-05 21:29:33 +00:00
  • a4451c7c3d Merge pull request #4011 from annando/archive-cleanup Hypolite Petovan 2017-12-05 07:47:44 -05:00
  • 88891d9ae1 Merge pull request #4012 from zeroadam/OAuth-quickfix Hypolite Petovan 2017-12-05 07:46:59 -05:00
  • 22a3c7ad7d remove index Adam Magness 2017-12-05 06:58:57 -05:00
  • 115d71e841 One tab too much Michael 2017-12-05 09:34:43 +00:00
  • 5f9e87ea5a Some cleanup for archiving/unarchiving contacts Michael 2017-12-05 07:08:20 +00:00
  • 12ab38f417 Merge pull request #4010 from tobiasd/20171205-chmod Michael Vogel 2017-12-05 07:49:13 +01:00
  • db4d44748b another -x Tobias Diekershoff 2017-12-05 07:26:02 +01:00
  • e614022634 added some x permissions to scripts Tobias Diekershoff 2017-12-05 07:21:21 +01:00
  • c258df0f0a removed x-permission Tobias Diekershoff 2017-12-05 07:13:55 +01:00
  • 82df294e31 Merge pull request #4009 from zeroadam/OAuth-hotfix Hypolite Petovan 2017-12-04 21:32:52 -05:00
  • e32b4ed670 More use Adam Magness 2017-12-04 21:18:48 -05:00
  • f1a5560804 Use statement Adam Magness 2017-12-04 21:13:58 -05:00
  • 0c48b4188b Non Static calls Adam Magness 2017-12-04 21:10:54 -05:00
  • e997128c9f Static Adam Magness 2017-12-04 21:03:39 -05:00
  • 448598495c Static Adam Magness 2017-12-04 21:00:47 -05:00
  • 9f4be62d3d Use statement Adam Magness 2017-12-04 20:30:10 -05:00
  • 072edc1949 Merge pull request #4008 from zeroadam/Oauth-#3878 Hypolite Petovan 2017-12-04 18:33:01 -05:00
  • d3473f9999 Update use Adam Magness 2017-12-04 18:30:18 -05:00
  • 547e24b443 Review Adam Magness 2017-12-04 16:33:10 -05:00
  • 2bbfc0640f Move to Network Adam Magness 2017-12-04 15:59:21 -05:00
  • 06d6d6c758 Merge pull request #4007 from annando/archive-contact Hypolite Petovan 2017-12-04 15:04:17 -05:00
  • 9c7b6d9d5f Functions and Standards Adam Magness 2017-12-04 14:52:04 -05:00
  • dc32553a1d Better usew the author Michael 2017-12-04 19:50:32 +00:00
  • a206f6d832 Only a newline Michael 2017-12-04 19:37:36 +00:00
  • 360e39ca5b unmark for archival Michael 2017-12-04 19:36:08 +00:00
  • b991d8ff77 Separate and move classes Adam Magness 2017-12-04 14:09:23 -05:00
  • 3bb53967f4 Merge remote-tracking branch 'upstream/develop' into archive-contact Michael 2017-12-04 19:05:53 +00:00
  • ca41e9154d Archive and unarchive contacts Michael 2017-12-04 19:04:50 +00:00
  • 2aa5af4a4a Merge pull request #4006 from zeroadam/Pidfile-#3878 Michael Vogel 2017-12-04 19:59:41 +01:00
  • 4a96f7b458 Pidfile to src Adam Magness 2017-12-04 13:12:22 -05:00
  • 755f6e8cc1 Merge pull request #4005 from zeroadam/Features-#3878 Hypolite Petovan 2017-12-04 09:41:01 -05:00
  • 4af9616b17 Standards Adam Magness 2017-12-04 09:16:15 -05:00
  • b1d16fbdf7 Update use statements Adam Magness 2017-12-04 09:04:36 -05:00