]>
git.mxchange.org Git - friendica.git/log
Michael Vogel [Wed, 13 Dec 2017 19:01:03 +0000 (20:01 +0100)]
Merge pull request #4054 from MrPetovan/bug/4041-fix-register
Fix registration
Hypolite Petovan [Wed, 13 Dec 2017 15:32:59 +0000 (10:32 -0500)]
Add INNER JOIN to admin pending user list please @annando
Michael Vogel [Wed, 13 Dec 2017 12:29:03 +0000 (13:29 +0100)]
Merge pull request #4057 from tobiasd/
20171213-fr
update for FR translation - thx Thecross!
Tobias Diekershoff [Wed, 13 Dec 2017 11:04:10 +0000 (12:04 +0100)]
Merge pull request #4056 from annando/missing-crypto
Bugfix for "Call to undefined function Friendica\Network\rsatopem()"
Tobias Diekershoff [Wed, 13 Dec 2017 11:01:11 +0000 (12:01 +0100)]
update for FR translation - thx Thecross!
Michael [Wed, 13 Dec 2017 10:34:51 +0000 (10:34 +0000)]
Bugfix for "Call to undefined function Friendica\Network\rsatopem()"
Tobias Diekershoff [Wed, 13 Dec 2017 09:38:48 +0000 (10:38 +0100)]
Merge pull request #4055 from annando/moved-feed
include/feed.php is now moved to /src as well
Michael [Wed, 13 Dec 2017 07:09:20 +0000 (07:09 +0000)]
Missing "use" added
Michael [Wed, 13 Dec 2017 07:06:36 +0000 (07:06 +0000)]
Removed old include
Michael [Wed, 13 Dec 2017 07:03:42 +0000 (07:03 +0000)]
The feed is now a class
Michael [Wed, 13 Dec 2017 07:02:52 +0000 (07:02 +0000)]
The feed moved into the new location
Hypolite Petovan [Wed, 13 Dec 2017 02:13:36 +0000 (21:13 -0500)]
Add Exception support to User::create usages
Hypolite Petovan [Wed, 13 Dec 2017 02:07:22 +0000 (21:07 -0500)]
Fix admin pending user list SQL
Hypolite Petovan [Wed, 13 Dec 2017 02:07:03 +0000 (21:07 -0500)]
Replace q() by dba function in User
- Add relevant Exceptions
- Fix admin email checking
Hypolite Petovan [Wed, 13 Dec 2017 01:52:50 +0000 (20:52 -0500)]
Add new group added id return to Group::create
Hypolite Petovan [Wed, 13 Dec 2017 01:52:28 +0000 (20:52 -0500)]
Format valid_email function in include/text
Hypolite Petovan [Wed, 13 Dec 2017 01:44:05 +0000 (20:44 -0500)]
Fix self-contact creation
- Discard useless intval()
- Add proper condition for `self`
Hypolite Petovan [Wed, 13 Dec 2017 01:43:21 +0000 (20:43 -0500)]
Add Exceptions to User::create
Hypolite Petovan [Tue, 12 Dec 2017 08:47:54 +0000 (03:47 -0500)]
Merge pull request #4053 from annando/useless_function_exists
Removed useless "function_exists" checks
Tobias Diekershoff [Tue, 12 Dec 2017 07:06:23 +0000 (08:06 +0100)]
Merge pull request #4052 from annando/issue-3911
Issue 3911: Now the categories are really fetched
Michael [Tue, 12 Dec 2017 05:35:41 +0000 (05:35 +0000)]
Issue 3911: Now the categories are really fetched
Michael [Tue, 12 Dec 2017 04:52:33 +0000 (04:52 +0000)]
Removed useless "function_exists" checks
Hypolite Petovan [Tue, 12 Dec 2017 01:38:54 +0000 (20:38 -0500)]
Merge pull request #4051 from annando/remove-duplicates
Fix for duplicate removal in the database structure check
Michael [Mon, 11 Dec 2017 21:53:52 +0000 (21:53 +0000)]
Fix for duplicate removal in the database structure check
Hypolite Petovan [Mon, 11 Dec 2017 01:10:25 +0000 (20:10 -0500)]
Merge pull request #4050 from hoergen/develop
removed avatar and name from month/week and fixed time display
hoergen [Sun, 10 Dec 2017 23:16:23 +0000 (00:16 +0100)]
Adjustments events view in timeline/wall
hoergen [Sun, 10 Dec 2017 23:03:59 +0000 (00:03 +0100)]
removed avatar and name from month/week and fixed time display
Hypolite Petovan [Sun, 10 Dec 2017 21:52:15 +0000 (16:52 -0500)]
Merge pull request #4049 from annando/bugfix-pr-4046
Bugfix to PR 4046: Repaired query
Michael [Sun, 10 Dec 2017 20:12:23 +0000 (20:12 +0000)]
Bugfix to PR 4046: Repaired query
Michael Vogel [Sun, 10 Dec 2017 14:16:55 +0000 (15:16 +0100)]
Merge pull request #4048 from hoergen/develop
Mostly calendar adjustments
hoergen [Sun, 10 Dec 2017 13:18:24 +0000 (14:18 +0100)]
Mostly calendar adjustments
Michael Vogel [Sun, 10 Dec 2017 12:32:59 +0000 (13:32 +0100)]
Merge pull request #4046 from MrPetovan/bug/4041-fix-register
Move Group to src
Hypolite Petovan [Sun, 10 Dec 2017 10:37:23 +0000 (05:37 -0500)]
Fix order parameter for dba::select
Michael Vogel [Sun, 10 Dec 2017 08:24:44 +0000 (09:24 +0100)]
Merge pull request #4047 from tobiasd/
20171210-fr
update for FR translation - thx Thecross!
Tobias Diekershoff [Sun, 10 Dec 2017 07:42:49 +0000 (08:42 +0100)]
update for FR translation - thx Thecross!
Hypolite Petovan [Sun, 10 Dec 2017 06:07:48 +0000 (01:07 -0500)]
Improve additional condition
Hypolite Petovan [Sun, 10 Dec 2017 06:06:12 +0000 (01:06 -0500)]
Fix wrong uses of dba::select
- Improve negative conditions
Hypolite Petovan [Sat, 9 Dec 2017 19:04:45 +0000 (14:04 -0500)]
Merge pull request #4045 from tobiasd/
20171209-fr
update for FR translation - thx Thecross!
Hypolite Petovan [Sat, 9 Dec 2017 19:04:13 +0000 (14:04 -0500)]
Merge pull request #4044 from annando/ejabberd-lock
Prevent the running of multiple xmpp auth daemons at a time
Tobias Diekershoff [Sat, 9 Dec 2017 18:54:56 +0000 (19:54 +0100)]
update for FR - thx Thecross!
Hypolite Petovan [Sat, 9 Dec 2017 18:45:54 +0000 (13:45 -0500)]
Remove include/group.php
Hypolite Petovan [Sat, 9 Dec 2017 18:45:17 +0000 (13:45 -0500)]
Use new Model methods for groups
Hypolite Petovan [Sat, 9 Dec 2017 18:42:02 +0000 (13:42 -0500)]
Fix formatting all around
Hypolite Petovan [Sat, 9 Dec 2017 18:31:00 +0000 (13:31 -0500)]
Add new method from include/group in relevant Model classes
Michael [Sat, 9 Dec 2017 17:49:11 +0000 (17:49 +0000)]
Reworked the pidfile class
Michael [Sat, 9 Dec 2017 12:23:15 +0000 (12:23 +0000)]
Faster credentials check
Michael [Sat, 9 Dec 2017 09:46:21 +0000 (09:46 +0000)]
Prevent the running of multiple xmpp auth daemons at a time
Tobias Diekershoff [Sat, 9 Dec 2017 06:03:23 +0000 (07:03 +0100)]
Merge pull request #4043 from hoergen/develop
added more styles for setting page and fixed input pointer
hoergen [Sat, 9 Dec 2017 03:03:18 +0000 (04:03 +0100)]
added more styles for setting page and fixed input pointer
Hypolite Petovan [Sat, 9 Dec 2017 00:24:43 +0000 (19:24 -0500)]
Fix formatting of mod/register
Hypolite Petovan [Fri, 8 Dec 2017 09:05:00 +0000 (04:05 -0500)]
Merge pull request #4040 from tobiasd/
20171209-en
EN US and GB translation updates
Tobias Diekershoff [Fri, 8 Dec 2017 08:42:24 +0000 (09:42 +0100)]
EN US and GB translation updates
Michael Vogel [Fri, 8 Dec 2017 06:35:55 +0000 (07:35 +0100)]
Merge pull request #4039 from annando/third-4036
And now for the third bugfix to PR 4036
Michael [Fri, 8 Dec 2017 06:32:14 +0000 (06:32 +0000)]
And now for the third bugfix to PR 4036
Michael Vogel [Fri, 8 Dec 2017 06:19:20 +0000 (07:19 +0100)]
Merge pull request #4038 from annando/second-bugfix-4036
Second bugfix to PR 4036
Michael [Fri, 8 Dec 2017 06:15:06 +0000 (06:15 +0000)]
Second bugfix to PR 4036
Michael Vogel [Fri, 8 Dec 2017 05:48:35 +0000 (06:48 +0100)]
Merge pull request #4037 from annando/bugfix-4036
Bugfix to PR 4036
Michael [Fri, 8 Dec 2017 05:44:43 +0000 (05:44 +0000)]
Bugfix to PR 4036
Michael Vogel [Fri, 8 Dec 2017 05:20:24 +0000 (06:20 +0100)]
Merge pull request #4036 from MrPetovan/task/3878-move-objects-to-model
Move objects to model (redux)
Hypolite Petovan [Thu, 7 Dec 2017 14:05:35 +0000 (09:05 -0500)]
Move Object\Profile to Model\Profile
Hypolite Petovan [Thu, 7 Dec 2017 14:09:28 +0000 (09:09 -0500)]
Rename Model\GlobalContact to Model\GContact
Hypolite Petovan [Thu, 7 Dec 2017 14:05:23 +0000 (09:05 -0500)]
Move Object\Conversation to Object\Thread
- Move Object\Item to Object\Post
Hypolite Petovan [Thu, 7 Dec 2017 14:04:24 +0000 (09:04 -0500)]
Move Object\Contact to Model\Contact
Hypolite Petovan [Thu, 7 Dec 2017 13:57:35 +0000 (08:57 -0500)]
Move Object\Profile to Model\Profile
Hypolite Petovan [Thu, 7 Dec 2017 13:56:11 +0000 (08:56 -0500)]
Separate Object\Photo into Model\Photo and Object\Image
- Renamed a bunch of functions to shorter or clearer names
Hypolite Petovan [Fri, 8 Dec 2017 04:51:03 +0000 (23:51 -0500)]
Merge branch 'task/3878-move-objects-to-model' of https://github.com/MrPetovan/friendica into task/3878-move-objects-to-model
Hypolite Petovan [Fri, 8 Dec 2017 04:36:33 +0000 (23:36 -0500)]
Fix class Object\Item not found in Object\Post
Hypolite Petovan [Fri, 8 Dec 2017 04:33:36 +0000 (23:33 -0500)]
Finish renaming Object\Item to Object\Post
Hypolite Petovan [Fri, 8 Dec 2017 04:36:33 +0000 (23:36 -0500)]
Fix class Object\Item not found in Object\Post
Hypolite Petovan [Fri, 8 Dec 2017 04:33:36 +0000 (23:33 -0500)]
Finish renaming Object\Item to Object\Post
Hypolite Petovan [Fri, 8 Dec 2017 04:32:49 +0000 (23:32 -0500)]
Fix undefined Imagick::scaleDown error
Michael Vogel [Fri, 8 Dec 2017 04:24:34 +0000 (05:24 +0100)]
Merge pull request #4035 from friendica/revert-4031-task/3878-move-objects-to-model
Revert "Move Objects to Model"
Michael Vogel [Fri, 8 Dec 2017 04:21:51 +0000 (05:21 +0100)]
Revert "Move Objects to Model"
Michael Vogel [Fri, 8 Dec 2017 04:02:21 +0000 (05:02 +0100)]
Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model
Move Objects to Model
Hypolite Petovan [Fri, 8 Dec 2017 01:49:33 +0000 (20:49 -0500)]
Merge pull request #4034 from hoergen/develop
Style buttons, lists, inputs and some cleanup
hoergen [Fri, 8 Dec 2017 01:16:50 +0000 (02:16 +0100)]
Style buttons, lists, inputs and some cleanup
Hypolite Petovan [Thu, 7 Dec 2017 21:12:49 +0000 (16:12 -0500)]
Merge pull request #4033 from annando/diaspora-autofriend
Possible fix for issue 4013
Michael [Thu, 7 Dec 2017 20:10:09 +0000 (20:10 +0000)]
Commented out the functionality
Michael [Thu, 7 Dec 2017 19:39:55 +0000 (19:39 +0000)]
Possible fix for issue 4013
Hypolite Petovan [Thu, 7 Dec 2017 19:12:03 +0000 (14:12 -0500)]
Hotfix regmod missing use statement
Hypolite Petovan [Thu, 7 Dec 2017 18:52:15 +0000 (13:52 -0500)]
Merge pull request #4032 from zeroadam/FrioAdjustment
frio: Fix contact template syntax triggering console error
Adam Magness [Thu, 7 Dec 2017 14:35:24 +0000 (09:35 -0500)]
Templete adjustment
based on errors that were showing up in the debugger console on chrome
Hypolite Petovan [Thu, 7 Dec 2017 14:09:28 +0000 (09:09 -0500)]
Rename Model\GlobalContact to Model\GContact
Hypolite Petovan [Thu, 7 Dec 2017 14:05:35 +0000 (09:05 -0500)]
Move Object\Profile to Model\Profile
Hypolite Petovan [Thu, 7 Dec 2017 14:05:23 +0000 (09:05 -0500)]
Move Object\Conversation to Object\Thread
- Move Object\Item to Object\Post
Hypolite Petovan [Thu, 7 Dec 2017 14:04:24 +0000 (09:04 -0500)]
Move Object\Contact to Model\Contact
Hypolite Petovan [Thu, 7 Dec 2017 13:57:35 +0000 (08:57 -0500)]
Move Object\Profile to Model\Profile
Hypolite Petovan [Thu, 7 Dec 2017 13:56:11 +0000 (08:56 -0500)]
Separate Object\Photo into Model\Photo and Object\Image
- Renamed a bunch of functions to shorter or clearer names
rabuzarus [Thu, 7 Dec 2017 13:16:45 +0000 (14:16 +0100)]
Merge pull request #4024 from MrPetovan/task/remove-unused-db-tables-doc
Remove unused table documentation
Hypolite Petovan [Thu, 7 Dec 2017 12:54:59 +0000 (07:54 -0500)]
Merge pull request #4029 from annando/update-pubkey
Update the public key for public contacts if the key was empty before
Hypolite Petovan [Thu, 7 Dec 2017 12:53:46 +0000 (07:53 -0500)]
Merge pull request #4028 from annando/mood2
We've got no mood anymore
Michael Vogel [Thu, 7 Dec 2017 09:14:45 +0000 (10:14 +0100)]
Merge pull request #4030 from AndyHee/20171207_patch
Typo
Andy H3 [Thu, 7 Dec 2017 07:45:37 +0000 (14:45 +0700)]
Update text.php
Corrected typo
Andy H3 [Thu, 7 Dec 2017 07:42:44 +0000 (14:42 +0700)]
Update dark.css
revert changes
AndyHee [Thu, 7 Dec 2017 07:35:19 +0000 (14:35 +0700)]
Merge remote-tracking branch 'upstream/develop' into develop
Michael [Thu, 7 Dec 2017 07:01:55 +0000 (07:01 +0000)]
We've got no mood anymore
Michael [Thu, 7 Dec 2017 06:51:38 +0000 (06:51 +0000)]
Update the public key for public contacts if the key was empty before
Michael Vogel [Thu, 7 Dec 2017 06:43:37 +0000 (07:43 +0100)]
Merge pull request #4026 from zeroadam/ModRemovals
Remove mod files
Michael Vogel [Thu, 7 Dec 2017 06:37:59 +0000 (07:37 +0100)]
Merge pull request #4027 from tobiasd/
20171207-lng
updates for core translation
Tobias Diekershoff [Thu, 7 Dec 2017 06:22:36 +0000 (07:22 +0100)]
update for FR
projects / friendica.git / log