]> git.mxchange.org Git - friendica.git/log
friendica.git
8 years agoVier: Pictures in the side bar shouldn't be larger than the side bar
Michael Vogel [Sat, 13 Feb 2016 13:21:53 +0000 (14:21 +0100)]
Vier: Pictures in the side bar shouldn't be larger than the side bar

8 years agoMerge pull request #2348 from annando/1602-poller-again
Tobias Diekershoff [Fri, 12 Feb 2016 10:25:49 +0000 (11:25 +0100)]
Merge pull request #2348 from annando/1602-poller-again

Database connections: When we now check for user values and system values

8 years agoDatabase connections: When we now check for user values we check the system values...
Michael Vogel [Fri, 12 Feb 2016 10:04:25 +0000 (11:04 +0100)]
Database connections: When we now check for user values we check the system values as well

8 years agoMerge pull request #2346 from annando/1602-poller-user-limits
Tobias Diekershoff [Fri, 12 Feb 2016 07:17:30 +0000 (08:17 +0100)]
Merge pull request #2346 from annando/1602-poller-user-limits

Poller: Now the user limits can be detected automatically as well

8 years agoMerge pull request #2347 from annando/1602-dfrn-forum
Tobias Diekershoff [Fri, 12 Feb 2016 07:16:10 +0000 (08:16 +0100)]
Merge pull request #2347 from annando/1602-dfrn-forum

DFRN-Bugfix: Forums should work now

8 years agoAdded some documentation
Michael Vogel [Fri, 12 Feb 2016 06:39:08 +0000 (07:39 +0100)]
Added some documentation

8 years agoDFRN-Bugfix: Forums should work now
Michael Vogel [Thu, 11 Feb 2016 21:35:06 +0000 (22:35 +0100)]
DFRN-Bugfix: Forums should work now

8 years agoPoller: Now the user limits can be detected automatically as well
Michael Vogel [Thu, 11 Feb 2016 20:39:34 +0000 (21:39 +0100)]
Poller: Now the user limits can be detected automatically as well

8 years agoMerge pull request #2344 from annando/1602-poller-processlist
Tobias Diekershoff [Thu, 11 Feb 2016 10:51:02 +0000 (11:51 +0100)]
Merge pull request #2344 from annando/1602-poller-processlist

Poller: Use the processlist

8 years agoPoller: Use the processlist when the number of maximum database connections was provi...
Michael Vogel [Thu, 11 Feb 2016 10:33:45 +0000 (11:33 +0100)]
Poller: Use the processlist when the number of maximum database connections was provided manually

8 years agoMerge pull request #2343 from fabrixxm/api_ping
Tobias Diekershoff [Thu, 11 Feb 2016 08:34:47 +0000 (09:34 +0100)]
Merge pull request #2343 from fabrixxm/api_ping

fix missing html2plain() function declaration

8 years agofix missing html2plain() function declaration
fabrixxm [Thu, 11 Feb 2016 08:05:00 +0000 (09:05 +0100)]
fix missing html2plain() function declaration

8 years agoMerge pull request #2336 from stieben/move-div-pause
Tobias Diekershoff [Thu, 11 Feb 2016 06:36:37 +0000 (07:36 +0100)]
Merge pull request #2336 from stieben/move-div-pause

Move div#pause to view/default.php

8 years agoMerge pull request #2341 from annando/1602-contact-bugfix
Tobias Diekershoff [Thu, 11 Feb 2016 06:35:32 +0000 (07:35 +0100)]
Merge pull request #2341 from annando/1602-contact-bugfix

Bugfix: The "keywords" field in the gcontact table wasn't set correctly

8 years agoMerge pull request #2325 from fabrixxm/api_ping
Michael Vogel [Wed, 10 Feb 2016 22:47:11 +0000 (23:47 +0100)]
Merge pull request #2325 from fabrixxm/api_ping

Api for notifications

8 years agoBugfix: The "keywords" field in the gcontact table wasn't set correctly
Michael Vogel [Wed, 10 Feb 2016 22:39:18 +0000 (23:39 +0100)]
Bugfix: The "keywords" field in the gcontact table wasn't set correctly

8 years agoMerge pull request #2338 from annando/1602-poller-max
Tobias Diekershoff [Wed, 10 Feb 2016 11:49:49 +0000 (12:49 +0100)]
Merge pull request #2338 from annando/1602-poller-max

Poller: The maximum number of connections can now be configured

8 years agoAdded documentation
Michael Vogel [Wed, 10 Feb 2016 06:56:49 +0000 (07:56 +0100)]
Added documentation

8 years agoPoller: The maximum number of connections can now be configured
Michael Vogel [Tue, 9 Feb 2016 22:28:33 +0000 (23:28 +0100)]
Poller: The maximum number of connections can now be configured

8 years agoAdded div#pause to themes' default.php
Andrej Stieben [Tue, 9 Feb 2016 15:41:19 +0000 (16:41 +0100)]
Added div#pause to themes' default.php

As requested by @tobiasd and @rabuzarus.

8 years agoMoved div#pause from index.php to view/default.php
Andrej Stieben [Tue, 9 Feb 2016 14:54:35 +0000 (15:54 +0100)]
Moved div#pause from index.php to view/default.php

This closes #2320.

8 years agoMerge branch 'develop' into api_ping
Fabrixxm [Tue, 9 Feb 2016 13:06:57 +0000 (14:06 +0100)]
Merge branch 'develop' into api_ping

8 years agoMerge pull request #2332 from annando/1602-no-guid
fabrixxm [Tue, 9 Feb 2016 12:40:05 +0000 (13:40 +0100)]
Merge pull request #2332 from annando/1602-no-guid

Get rid of the "guid" table. We don't need it anymore.

8 years agoMerge pull request #2331 from fabrixxm/revert_pr2319
Michael Vogel [Tue, 9 Feb 2016 09:52:46 +0000 (10:52 +0100)]
Merge pull request #2331 from fabrixxm/revert_pr2319

Revert "Merge pull request #2319 from stieben/develop"

8 years agoGet rid of the "guid" table. We don't need it anymore.
Michael Vogel [Tue, 9 Feb 2016 09:21:10 +0000 (10:21 +0100)]
Get rid of the "guid" table. We don't need it anymore.

8 years agoRevert "Merge pull request #2319 from stieben/develop"
Fabrixxm [Tue, 9 Feb 2016 08:39:29 +0000 (09:39 +0100)]
Revert "Merge pull request #2319 from stieben/develop"

This reverts commit 9330a6994c1b9aee49a482efe32e84ca1a944c9b, reversing
changes made to ecfb6ec92460e3cd401789e44cd48a8bc503d762.

But it keeps changes to doc/Plugins.md and doc/de/Plugins.md

8 years agoMerge pull request #2329 from annando/1602-poller-db
Tobias Diekershoff [Tue, 9 Feb 2016 06:36:39 +0000 (07:36 +0100)]
Merge pull request #2329 from annando/1602-poller-db

Poller: Check the number of used database connections

8 years agoMerge pull request #2326 from fabrixxm/revert_db949bb8
Michael Vogel [Tue, 9 Feb 2016 05:55:49 +0000 (06:55 +0100)]
Merge pull request #2326 from fabrixxm/revert_db949bb8

Revert "Updated modules to allow for partial overrides without errors"

8 years agoPoller: Check the number of used database connections
Michael Vogel [Tue, 9 Feb 2016 05:42:00 +0000 (06:42 +0100)]
Poller: Check the number of used database connections

8 years agoMerge pull request #2327 from annando/1602-dfrn-poke
Tobias Diekershoff [Tue, 9 Feb 2016 05:27:09 +0000 (06:27 +0100)]
Merge pull request #2327 from annando/1602-dfrn-poke

DFRN: Sending pokes does work now again

8 years agoDFRN: Sending pokes does work now again
Michael Vogel [Mon, 8 Feb 2016 21:37:29 +0000 (22:37 +0100)]
DFRN: Sending pokes does work now again

8 years agoMerge pull request #1 from friendica/develop
Andrej Stieben [Mon, 8 Feb 2016 21:23:01 +0000 (22:23 +0100)]
Merge pull request #1 from friendica/develop

Merge upstream/develop

8 years agoMerge pull request #2323 from annando/1601-dfrn-import
fabrixxm [Mon, 8 Feb 2016 14:48:16 +0000 (15:48 +0100)]
Merge pull request #2323 from annando/1601-dfrn-import

Complete rewrite of DFRN import

8 years agoNow the public static functions are public static functions
Michael Vogel [Mon, 8 Feb 2016 14:26:24 +0000 (15:26 +0100)]
Now the public static functions are public static functions

8 years agoadd missing query backticks
Fabrixxm [Mon, 8 Feb 2016 13:35:41 +0000 (14:35 +0100)]
add missing query backticks

8 years agoNotificationsManager: add backtick to queries
Fabrixxm [Mon, 8 Feb 2016 12:42:06 +0000 (13:42 +0100)]
NotificationsManager: add backtick to queries

8 years agoapi docs: fix indentation
Fabrixxm [Mon, 8 Feb 2016 09:34:27 +0000 (10:34 +0100)]
api docs: fix indentation

8 years agoUpdate API docs
Fabrixxm [Mon, 8 Feb 2016 09:22:12 +0000 (10:22 +0100)]
Update API docs

Add `friendica/notification` and `friendica/notification/seen` endpoints

Fix some list rendering issues

Move all `friendica/*` endpoints under "Implemented API calls (not compatible with other APIs)" section

Add info about permitted HTTP methods and required auth

8 years agoadd docs, rewrite part of the notification api
Fabrixxm [Mon, 8 Feb 2016 08:47:59 +0000 (09:47 +0100)]
add docs, rewrite part of the notification api

list notifications and set note as seen functionalities are now
splitted in two functions, with correct http method requirement.

Fixed returned value from `notification/seen`

8 years agoMerge pull request #2314 from rabuzarus/0302_datetime_cleanup
Michael Vogel [Mon, 8 Feb 2016 02:33:25 +0000 (03:33 +0100)]
Merge pull request #2314 from rabuzarus/0302_datetime_cleanup

datetime.php cleanup

8 years agodatetime.php: cleanup - delete some dots which shouldn't be there
rabuzarus [Mon, 8 Feb 2016 00:59:05 +0000 (01:59 +0100)]
datetime.php: cleanup - delete some dots which shouldn't be there

8 years agoRevert "Updated modules to allow for partial overrides without errors"
fabrixxm [Sun, 7 Feb 2016 14:11:34 +0000 (15:11 +0100)]
Revert "Updated modules to allow for partial overrides without errors"

This reverts commit db949bb802448184bfe5164d8d3dd86ddf51b187.

8 years agofix error in template in notifications page
fabrixxm [Sun, 7 Feb 2016 13:29:07 +0000 (14:29 +0100)]
fix error in template in notifications page

8 years agonew api for notifications
fabrixxm [Sun, 7 Feb 2016 13:27:13 +0000 (14:27 +0100)]
new api for notifications

/api/friendica/notification
returns first 50 notifications for current user

/api/friendica&notification/<id>
set note <id> as seen and return item object if possible

new class NotificationsManager to query for notifications and set seen
state

8 years agoMerge pull request #2324 from rabuzarus/0502_vier_dark
fabrixxm [Sun, 7 Feb 2016 08:53:24 +0000 (09:53 +0100)]
Merge pull request #2324 from rabuzarus/0502_vier_dark

vier: some consistency fixes for the dark scheme

8 years agoMerge pull request #2319 from stieben/develop
fabrixxm [Sun, 7 Feb 2016 08:52:20 +0000 (09:52 +0100)]
Merge pull request #2319 from stieben/develop

Added the possibility for themes to override core module functions

8 years agoMerge pull request #2313 from rabuzarus/0302_forum_class
fabrixxm [Sun, 7 Feb 2016 08:28:50 +0000 (09:28 +0100)]
Merge pull request #2313 from rabuzarus/0302_forum_class

forums.php is now ForumManager.php and providing class ForumManager

8 years agoJust some more code cleanup and documentation.
Michael Vogel [Sat, 6 Feb 2016 20:44:10 +0000 (21:44 +0100)]
Just some more code cleanup and documentation.

8 years agoThe code was rearranged to improve readability
Michael Vogel [Sat, 6 Feb 2016 16:48:03 +0000 (17:48 +0100)]
The code was rearranged to improve readability

8 years agoMerge develop into 0502_vier_dark
rabuzarus [Sat, 6 Feb 2016 12:09:41 +0000 (13:09 +0100)]
Merge develop into 0502_vier_dark

Conflicts:
view/theme/vier/dark.css

8 years agoReceiving pokes work now
Michael Vogel [Sat, 6 Feb 2016 10:16:00 +0000 (11:16 +0100)]
Receiving pokes work now

8 years agoBugfix in the poke function / added documentation.
Michael Vogel [Sat, 6 Feb 2016 09:16:16 +0000 (10:16 +0100)]
Bugfix in the poke function / added documentation.

8 years agoMerge pull request #2322 from rabuzarus/0502_vier_smiley
Tobias Diekershoff [Sat, 6 Feb 2016 06:27:33 +0000 (07:27 +0100)]
Merge pull request #2322 from rabuzarus/0502_vier_smiley

vier: display smiley-preview as inline-block - needs addons update

8 years agodatetime.php: little more docu
rabuzarus [Sat, 6 Feb 2016 00:08:10 +0000 (01:08 +0100)]
datetime.php: little more docu

8 years agovier: some consistency fixes for the dark scheme
rabuzarus [Fri, 5 Feb 2016 23:54:50 +0000 (00:54 +0100)]
vier: some consistency fixes for the dark scheme

8 years agoAdded documentation
Michael Vogel [Fri, 5 Feb 2016 21:12:54 +0000 (22:12 +0100)]
Added documentation

8 years agoUpdated modules to allow for partial overrides without errors
Andrej Stieben [Fri, 5 Feb 2016 20:52:39 +0000 (21:52 +0100)]
Updated modules to allow for partial overrides without errors

Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.

8 years agovier smileybutton: dark.css insert new line at the end of the file
rabuzarus [Fri, 5 Feb 2016 20:38:55 +0000 (21:38 +0100)]
vier smileybutton: dark.css insert new line at the end of the file

8 years agoBugfix for OStatus to prevent sending messages from wrong senders
Michael Vogel [Fri, 5 Feb 2016 20:31:11 +0000 (21:31 +0100)]
Bugfix for OStatus to prevent sending messages from wrong senders

8 years agovier smileybutton: little polish in dark.css
rabuzarus [Fri, 5 Feb 2016 20:30:31 +0000 (21:30 +0100)]
vier smileybutton: little polish in dark.css

8 years agoDFRN import has now gone live
Michael Vogel [Fri, 5 Feb 2016 20:25:20 +0000 (21:25 +0100)]
DFRN import has now gone live

8 years agovier: display smiley-preview as inline-block - needs addons update
rabuzarus [Fri, 5 Feb 2016 20:24:01 +0000 (21:24 +0100)]
vier: display smiley-preview as inline-block - needs addons update

8 years agoMerge pull request #2321 from fabrixxm/mobile_acl_dialog
Tobias Diekershoff [Fri, 5 Feb 2016 18:06:24 +0000 (19:06 +0100)]
Merge pull request #2321 from fabrixxm/mobile_acl_dialog

ACL: fix TypeError when selecting permissions

8 years agoACL: fix TypeError when selecting permissions
fabrixxm [Fri, 5 Feb 2016 17:43:46 +0000 (18:43 +0100)]
ACL: fix TypeError when selecting permissions

8 years agoMinor documentation update, as requested by @tobiasd
Andrej Stieben [Fri, 5 Feb 2016 13:11:10 +0000 (14:11 +0100)]
Minor documentation update, as requested by @tobiasd

8 years agoAdded some to-do points
Michael Vogel [Fri, 5 Feb 2016 08:03:17 +0000 (09:03 +0100)]
Added some to-do points

8 years agoMerge pull request #2317 from rabuzarus/0402_vier_mobile_textarea
Tobias Diekershoff [Fri, 5 Feb 2016 05:57:07 +0000 (06:57 +0100)]
Merge pull request #2317 from rabuzarus/0402_vier_mobile_textarea

vier: remove some hardcoded css to be more mobile friendly

8 years agoMerge pull request #2318 from annando/1602-vier-font
Tobias Diekershoff [Fri, 5 Feb 2016 05:56:26 +0000 (06:56 +0100)]
Merge pull request #2318 from annando/1602-vier-font

Vier: The font "system" can make the system look ugly

8 years agoFeed should work now as well
Michael Vogel [Thu, 4 Feb 2016 22:52:06 +0000 (23:52 +0100)]
Feed should work now as well

8 years agoAdded the possibility for themes to override core module functions
Andrej Stieben [Thu, 4 Feb 2016 20:45:21 +0000 (21:45 +0100)]
Added the possibility for themes to override core module functions

8 years agoEvents do work now.
Michael Vogel [Thu, 4 Feb 2016 19:34:18 +0000 (20:34 +0100)]
Events do work now.

8 years agoImproved documentation formatting (of Plugins.md)
Andrej Stieben [Thu, 4 Feb 2016 18:37:06 +0000 (19:37 +0100)]
Improved documentation formatting (of Plugins.md)

8 years agoVier: The font "system" can make the system look ugly
Michael Vogel [Thu, 4 Feb 2016 17:58:33 +0000 (18:58 +0100)]
Vier: The font "system" can make the system look ugly

8 years agovier: little float fix
rabuzarus [Thu, 4 Feb 2016 15:45:39 +0000 (16:45 +0100)]
vier: little float fix

8 years agovier: remove some hardcoded css to be more mobile friendly
rabuzarus [Thu, 4 Feb 2016 15:21:40 +0000 (16:21 +0100)]
vier: remove some hardcoded css to be more mobile friendly

8 years agoAdded some more logging
Michael Vogel [Thu, 4 Feb 2016 14:53:22 +0000 (15:53 +0100)]
Added some more logging

8 years agoForum class - rename Class CamelCase and rename some methods
rabuzarus [Thu, 4 Feb 2016 13:51:54 +0000 (14:51 +0100)]
Forum class - rename Class CamelCase and rename some methods

8 years agoForum class - rename Class CamelCase and rename some methods
rabuzarus [Thu, 4 Feb 2016 13:47:20 +0000 (14:47 +0100)]
Forum class - rename Class CamelCase and rename some methods

8 years agoDFRN: Contact-id is now stored depending on the author/Some more bugfixes
Michael Vogel [Thu, 4 Feb 2016 11:51:34 +0000 (12:51 +0100)]
DFRN: Contact-id is now stored depending on the author/Some more bugfixes

8 years agoAdded documentation, fixed some bug
Michael Vogel [Thu, 4 Feb 2016 09:19:13 +0000 (10:19 +0100)]
Added documentation, fixed some bug

8 years agoMerge pull request #2316 from fabrixxm/mobile_acl_dialog
Tobias Diekershoff [Thu, 4 Feb 2016 06:47:45 +0000 (07:47 +0100)]
Merge pull request #2316 from fabrixxm/mobile_acl_dialog

fix empty ACL window on desktop

8 years agofix empty ACL window on desktop
fabrixxm [Wed, 3 Feb 2016 22:22:45 +0000 (23:22 +0100)]
fix empty ACL window on desktop

8 years agoDifferences fixed between old and new code
Michael Vogel [Wed, 3 Feb 2016 22:04:52 +0000 (23:04 +0100)]
Differences fixed between old and new code

8 years agoMerge pull request #2315 from silke/documentation
Tobias Diekershoff [Wed, 3 Feb 2016 19:54:32 +0000 (20:54 +0100)]
Merge pull request #2315 from silke/documentation

Slightly updated docs about Let's Encrypt

8 years agoSlightly updated docs about Let's Encrypt
Silke Meyer [Wed, 3 Feb 2016 19:47:41 +0000 (20:47 +0100)]
Slightly updated docs about Let's Encrypt

8 years agoMerge pull request #2312 from fabrixxm/mobile_acl_dialog
Tobias Diekershoff [Wed, 3 Feb 2016 19:00:58 +0000 (20:00 +0100)]
Merge pull request #2312 from fabrixxm/mobile_acl_dialog

Mobile acl dialog and other mobile fix for Vier

8 years agodatetime.php cleanup
rabuzarus [Wed, 3 Feb 2016 18:48:09 +0000 (19:48 +0100)]
datetime.php cleanup

8 years agoforums.php is now forum.php and providing class forum
rabuzarus [Wed, 3 Feb 2016 17:05:26 +0000 (18:05 +0100)]
forums.php is now forum.php and providing class forum

8 years agoVier mobile: better jot buttons on small screens
Fabrixxm [Wed, 3 Feb 2016 14:01:24 +0000 (15:01 +0100)]
Vier mobile: better jot buttons on small screens

8 years agoVier mobile: fix content width, events style, oembed
Fabrixxm [Wed, 3 Feb 2016 13:48:46 +0000 (14:48 +0100)]
Vier mobile: fix content width, events style, oembed

8 years agoVier - mobile friendly ACL window and form fields
Fabrixxm [Wed, 3 Feb 2016 13:03:00 +0000 (14:03 +0100)]
Vier - mobile friendly ACL window and form fields

8 years agoPass App class instace to all templates via "$APP" variable
Fabrixxm [Wed, 3 Feb 2016 13:01:37 +0000 (14:01 +0100)]
Pass App class instace to all templates via "$APP" variable

8 years agoMerge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
Michael Vogel [Wed, 3 Feb 2016 07:34:11 +0000 (08:34 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import

8 years agoMerge pull request #2310 from rabuzarus/0302_vier_photo
Tobias Diekershoff [Wed, 3 Feb 2016 06:07:38 +0000 (07:07 +0100)]
Merge pull request #2310 from rabuzarus/0302_vier_photo

vier: use object-fit: cover for recent photos view

8 years agoMerge pull request #2309 from annando/1602-new-guid
Tobias Diekershoff [Wed, 3 Feb 2016 06:07:13 +0000 (07:07 +0100)]
Merge pull request #2309 from annando/1602-new-guid

New method to create a guid if none was given

8 years agoAdded some documentation
Michael Vogel [Wed, 3 Feb 2016 04:00:26 +0000 (05:00 +0100)]
Added some documentation

8 years agovier: use object-fit: cover for recent photos view
rabuzarus [Wed, 3 Feb 2016 02:59:42 +0000 (03:59 +0100)]
vier: use object-fit: cover for recent photos view

8 years agoMerge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
Michael Vogel [Tue, 2 Feb 2016 20:09:08 +0000 (21:09 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import

8 years agoMerge pull request #2306 from tobiasd/20160131-IT
Michael Vogel [Tue, 2 Feb 2016 20:07:24 +0000 (21:07 +0100)]
Merge pull request #2306 from tobiasd/20160131-IT

IT update to the strings

8 years agoMerge pull request #2308 from rabuzarus/0202_update_ps
Michael Vogel [Tue, 2 Feb 2016 20:06:56 +0000 (21:06 +0100)]
Merge pull request #2308 from rabuzarus/0202_update_ps

perfect-scrollbar: update to 0.6.10