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

Commit Graph

  • dc7bff0235 Merge pull request #4073 from MrPetovan/bug/4070-fix-user-create Michael Vogel 2017-12-16 04:11:54 +01:00
  • f415ee64e7 Merge pull request #4074 from MrPetovan/task/update-composer Michael Vogel 2017-12-16 04:08:37 +01:00
  • 90f4aa36b6 Update Composer Hypolite Petovan 2017-12-15 22:02:22 -05:00
  • d500d06a06 Fix User::create return variable Hypolite Petovan 2017-12-15 20:47:10 -05:00
  • a3ea106662 Merge pull request #4068 from rabuzarus/20171215_-_frio_fix_contact_list Hypolite Petovan 2017-12-15 15:04:48 -05:00
  • 0787f093d6 frio: remove shome whitespace rabuzarus 2017-12-15 18:16:07 +01:00
  • 85f558d8fb frio: fix some contact list issues rabuzarus 2017-12-15 18:09:04 +01:00
  • 39dcec66d8 Merge pull request #4066 from MrPetovan/bug/4046-remove-group_member-uid Michael Vogel 2017-12-15 17:47:57 +01:00
  • 6dbd68e0cb Remove redundant index - Increase UPDATE_VERSION and DB_UPDATE_VERSION Hypolite Petovan 2017-12-15 11:36:06 -05:00
  • 868a84c5cc Use INNER for group_member join Hypolite Petovan 2017-12-15 08:44:00 -05:00
  • c8c7ff2a2e Add new UNIQUE index to group_member Hypolite Petovan 2017-12-15 08:43:37 -05:00
  • 7eb2aa2ac5 Merge pull request #4067 from annando/removed-unused Hypolite Petovan 2017-12-15 08:00:32 -05:00
  • 1e0c46e8a3 Deprecated file removed Michael 2017-12-15 11:25:05 +00:00
  • 179b311978 Remove group_member.uid Hypolite Petovan 2017-12-14 22:47:58 -05:00
  • afbfbde112 Merge pull request #4065 from annando/dbstructure-class Hypolite Petovan 2017-12-14 17:48:38 -05:00
  • 559f8b446b Why I had coded it that way? Now it is better Michael 2017-12-14 22:22:44 +00:00
  • 2d7cd2daf4 "update" is enough Michael 2017-12-14 22:18:53 +00:00
  • cf56de1e77 Merge remote-tracking branch 'upstream/develop' into dbstructure-class Michael 2017-12-14 21:42:26 +00:00
  • 2179a7faa8 Now it works Michael 2017-12-14 21:32:53 +00:00
  • 0d2087fe6e The DBStructure class now exists Michael 2017-12-14 21:14:02 +00:00
  • 15d42de647 Class moved, changes applied Michael 2017-12-14 21:13:02 +00:00
  • 4269c108c1 Merge pull request #4064 from annando/fix-group Hypolite Petovan 2017-12-14 14:25:30 -05:00
  • 89ad41aca5 Bugfix: Calls to a renamed function had been changed Michael 2017-12-14 18:06:48 +00:00
  • ab80e6d92a Merge pull request #4063 from annando/daemon-works Hypolite Petovan 2017-12-14 12:15:05 -05:00
  • 22c695cad2 Merge pull request #4062 from annando/daemon-works Hypolite Petovan 2017-12-14 11:49:17 -05:00
  • 5417099f72 Spawn now spawns Michael 2017-12-14 16:41:56 +00:00
  • 611c38b3e3 The daemon now works fine Michael 2017-12-14 16:38:51 +00:00
  • 369fcb7bae Merge pull request #4060 from annando/system-unavailable Hypolite Petovan 2017-12-13 17:01:47 -05:00
  • 0457bd995f "system_unavailable.php" is unavailable now Michael 2017-12-13 21:55:19 +00:00
  • 74767ad321 Merge pull request #4059 from annando/maps Hypolite Petovan 2017-12-13 16:44:55 -05:00
  • 5a0260a10f The Map class is now done Michael 2017-12-13 21:38:14 +00:00
  • ea10a7c002 Map is moved to the new place Michael 2017-12-13 21:37:34 +00:00
  • 35c10ac335 Merge pull request #4058 from annando/mail-stuff Hypolite Petovan 2017-12-13 16:00:10 -05:00
  • 9d574f6666 Forgotten include Michael 2017-12-13 20:58:15 +00:00
  • 58df57df6e msgclean.php and quoteconvert.php is now integrated into Email.php Michael 2017-12-13 20:36:50 +00:00
  • f58167b000 Merge pull request #4054 from MrPetovan/bug/4041-fix-register Michael Vogel 2017-12-13 20:01:03 +01:00
  • 6362296666 Add INNER JOIN to admin pending user list please @annando Hypolite Petovan 2017-12-13 10:32:59 -05:00
  • 77e249effb Merge pull request #4057 from tobiasd/20171213-fr Michael Vogel 2017-12-13 13:29:03 +01:00
  • 535a656882 Merge pull request #4056 from annando/missing-crypto Tobias Diekershoff 2017-12-13 12:04:10 +01:00
  • 1c9d137c28 update for FR translation - thx Thecross! Tobias Diekershoff 2017-12-13 12:01:11 +01:00
  • 44679a73b7 Bugfix for "Call to undefined function Friendica\Network\rsatopem()" Michael 2017-12-13 10:34:51 +00:00
  • f99fb2245e Merge pull request #4055 from annando/moved-feed Tobias Diekershoff 2017-12-13 10:38:48 +01:00
  • 785fcd5916 Missing "use" added Michael 2017-12-13 07:09:20 +00:00
  • 84b85e9198 Removed old include Michael 2017-12-13 07:06:36 +00:00
  • 74ba0c896a The feed is now a class Michael 2017-12-13 07:03:42 +00:00
  • fc55a4b9c0 The feed moved into the new location Michael 2017-12-13 07:02:52 +00:00
  • 4d72a40aa6 Add Exception support to User::create usages Hypolite Petovan 2017-12-12 21:13:36 -05:00
  • 9063c830f5 Fix admin pending user list SQL Hypolite Petovan 2017-12-12 21:07:22 -05:00
  • fbf57ac98b Replace q() by dba function in User Hypolite Petovan 2017-12-12 21:07:03 -05:00
  • 72641e86a8 Add new group added id return to Group::create Hypolite Petovan 2017-12-12 20:52:50 -05:00
  • 385a36138a Format valid_email function in include/text Hypolite Petovan 2017-12-12 20:52:28 -05:00
  • 0afdf92ca1 Fix self-contact creation Hypolite Petovan 2017-12-12 20:44:05 -05:00
  • ac3642e76f Add Exceptions to User::create Hypolite Petovan 2017-12-12 20:43:21 -05:00
  • af6ca96e66 Merge pull request #4053 from annando/useless_function_exists Hypolite Petovan 2017-12-12 03:47:54 -05:00
  • 3a1a320dd8 Merge pull request #4052 from annando/issue-3911 Tobias Diekershoff 2017-12-12 08:06:23 +01:00
  • e834f905c6 Issue 3911: Now the categories are really fetched Michael 2017-12-12 05:35:41 +00:00
  • 88ef61df95 Removed useless "function_exists" checks Michael 2017-12-12 04:52:33 +00:00
  • 8b4c4572d3 Merge pull request #4051 from annando/remove-duplicates Hypolite Petovan 2017-12-11 20:38:54 -05:00
  • 63b4d84ea9 Fix for duplicate removal in the database structure check Michael 2017-12-11 21:53:52 +00:00
  • 18b5151405 Merge pull request #4050 from hoergen/develop Hypolite Petovan 2017-12-10 20:10:25 -05:00
  • 95309fe5c4 Adjustments events view in timeline/wall hoergen 2017-12-11 00:16:23 +01:00
  • 6baf7b4da2 removed avatar and name from month/week and fixed time display hoergen 2017-12-11 00:03:59 +01:00
  • 8d57c7c94a Merge pull request #4049 from annando/bugfix-pr-4046 Hypolite Petovan 2017-12-10 16:52:15 -05:00
  • 48b49dbc4b Bugfix to PR 4046: Repaired query Michael 2017-12-10 20:12:23 +00:00
  • d90c39f54c Merge pull request #4048 from hoergen/develop Michael Vogel 2017-12-10 15:16:55 +01:00
  • f4fdf61f44 Mostly calendar adjustments hoergen 2017-12-10 14:18:24 +01:00
  • 57f8496c53 Merge pull request #4046 from MrPetovan/bug/4041-fix-register Michael Vogel 2017-12-10 13:32:59 +01:00
  • b0fb398844 Fix order parameter for dba::select Hypolite Petovan 2017-12-10 05:37:23 -05:00
  • 45ac1b792d Merge pull request #4047 from tobiasd/20171210-fr Michael Vogel 2017-12-10 09:24:44 +01:00
  • 9d9840592f update for FR translation - thx Thecross! Tobias Diekershoff 2017-12-10 08:42:49 +01:00
  • c714ee519f Improve additional condition Hypolite Petovan 2017-12-10 01:07:48 -05:00
  • 3ea9060259 Fix wrong uses of dba::select Hypolite Petovan 2017-12-10 01:06:12 -05:00
  • dab2669fa4 Merge pull request #4045 from tobiasd/20171209-fr Hypolite Petovan 2017-12-09 14:04:45 -05:00
  • 33ccd501b9 Merge pull request #4044 from annando/ejabberd-lock Hypolite Petovan 2017-12-09 14:04:13 -05:00
  • 274b83c9a9 update for FR - thx Thecross! Tobias Diekershoff 2017-12-09 19:54:56 +01:00
  • 4fe8dab08d Remove include/group.php Hypolite Petovan 2017-12-09 13:45:54 -05:00
  • abdecd2b2f Use new Model methods for groups Hypolite Petovan 2017-12-09 13:45:17 -05:00
  • fe89e7760e Fix formatting all around Hypolite Petovan 2017-12-09 13:42:02 -05:00
  • 669c7dea59 Add new method from include/group in relevant Model classes Hypolite Petovan 2017-12-09 13:31:00 -05:00
  • 38d5932156 Reworked the pidfile class Michael 2017-12-09 17:49:11 +00:00
  • 0f149a691e Faster credentials check Michael 2017-12-09 12:23:15 +00:00
  • 8db5b121ff Prevent the running of multiple xmpp auth daemons at a time Michael 2017-12-09 09:46:21 +00:00
  • bd0c0eea4c Merge pull request #4043 from hoergen/develop Tobias Diekershoff 2017-12-09 07:03:23 +01:00
  • 6bf75a2f31 added more styles for setting page and fixed input pointer hoergen 2017-12-09 04:03:18 +01:00
  • e44abb6c2a Fix formatting of mod/register Hypolite Petovan 2017-12-08 19:24:43 -05:00
  • 3c2d3d5073 Merge pull request #4040 from tobiasd/20171209-en Hypolite Petovan 2017-12-08 04:05:00 -05:00
  • 6d48f5578d EN US and GB translation updates Tobias Diekershoff 2017-12-08 09:42:24 +01:00
  • 0ef2425a3e Merge pull request #4039 from annando/third-4036 Michael Vogel 2017-12-08 07:35:55 +01:00
  • 14d4ffbe7a And now for the third bugfix to PR 4036 Michael 2017-12-08 06:32:14 +00:00
  • 23ca4f92af Merge pull request #4038 from annando/second-bugfix-4036 Michael Vogel 2017-12-08 07:19:20 +01:00
  • 0a946587b5 Second bugfix to PR 4036 Michael 2017-12-08 06:15:06 +00:00
  • 6287e46650 Merge pull request #4037 from annando/bugfix-4036 Michael Vogel 2017-12-08 06:48:35 +01:00
  • 79c841a260 Bugfix to PR 4036 Michael 2017-12-08 05:44:43 +00:00
  • 5ba6c7717a Merge pull request #4036 from MrPetovan/task/3878-move-objects-to-model Michael Vogel 2017-12-08 06:20:24 +01:00
  • d3182d93ac Move Object\Profile to Model\Profile Hypolite Petovan 2017-12-07 09:05:35 -05:00
  • bc58e8d3be Rename Model\GlobalContact to Model\GContact Hypolite Petovan 2017-12-07 09:09:28 -05:00
  • 3772cf7544 Move Object\Conversation to Object\Thread Hypolite Petovan 2017-12-07 09:05:23 -05:00
  • a42595a30c Move Object\Contact to Model\Contact Hypolite Petovan 2017-12-07 09:04:24 -05:00
  • 6b60b89385 Move Object\Profile to Model\Profile Hypolite Petovan 2017-12-07 08:57:35 -05:00
  • 3fc3e67b70 Separate Object\Photo into Model\Photo and Object\Image Hypolite Petovan 2017-12-07 08:56:11 -05:00