]>
git.mxchange.org Git - friendica.git/log
rabuzarus [Sat, 25 Mar 2017 18:12:16 +0000 (19:12 +0100)]
some work on code standards compliance
rabuzarus [Tue, 21 Mar 2017 22:08:37 +0000 (23:08 +0100)]
upload images to the selected album
rabuzarus [Tue, 21 Mar 2017 20:18:27 +0000 (21:18 +0100)]
remove upload file from jot because it's now in the browser included
rabuzarus [Tue, 21 Mar 2017 19:39:31 +0000 (20:39 +0100)]
add justified-gallery to fbrowser
rabuzarus [Tue, 21 Mar 2017 02:35:25 +0000 (03:35 +0100)]
frio: gui work for fbrowser + switch between image and file mode
rabuzarus [Mon, 20 Mar 2017 21:45:24 +0000 (22:45 +0100)]
Bugfix: fbrowser did insert 2 Pictures instead of only 1
Hypolite Petovan [Mon, 20 Mar 2017 17:18:18 +0000 (13:18 -0400)]
Merge pull request #3241 from rabuzarus/20170316_-_fix_event_edit
add dop event & fix event edit
rabuzarus [Mon, 20 Mar 2017 16:19:24 +0000 (17:19 +0100)]
add missed NULL_DATE
rabuzarus [Mon, 20 Mar 2017 16:16:39 +0000 (17:16 +0100)]
Merge origin/20170316_-_fix_event_edit into 20170316_-_fix_event_edit
Conflicts:
mod/events.php
rabuzarus [Mon, 20 Mar 2017 15:59:21 +0000 (16:59 +0100)]
add NULL_DATE & coding standard work
rabuzarus [Mon, 20 Mar 2017 15:46:36 +0000 (16:46 +0100)]
Merge develop into 20170316_-_fix_event_edit
Conflicts:
mod/events.php
Hypolite Petovan [Mon, 20 Mar 2017 15:08:07 +0000 (11:08 -0400)]
Merge branch 'develop' into 20170316_-_fix_event_edit
Michael Vogel [Mon, 20 Mar 2017 07:40:37 +0000 (08:40 +0100)]
Merge pull request #3250 from tobiasd/
20170320-msg
regenerated master messages.po file
Tobias Diekershoff [Mon, 20 Mar 2017 07:27:10 +0000 (08:27 +0100)]
regenerated master messages.po file
Tobias Diekershoff [Mon, 20 Mar 2017 06:20:23 +0000 (07:20 +0100)]
Merge pull request #3247 from annando/issue-3242-b
If the maintenance reason is a url, then redirect to this address
Michael [Mon, 20 Mar 2017 04:37:59 +0000 (04:37 +0000)]
Test code removed
Michael [Mon, 20 Mar 2017 04:37:13 +0000 (04:37 +0000)]
Enhanced explanation
Hypolite Petovan [Mon, 20 Mar 2017 01:00:55 +0000 (21:00 -0400)]
Merge pull request #3249 from annando/bugfix-dbstructure
Bugfix for issue 3242 - forgotten "use"
Michael [Sun, 19 Mar 2017 22:58:35 +0000 (22:58 +0000)]
Bugfix for issue 3242 - forgotten "use"
Michael [Sun, 19 Mar 2017 19:03:09 +0000 (19:03 +0000)]
If the maintenance reason is a url, then redirect to this address
Hypolite Petovan [Sun, 19 Mar 2017 15:06:25 +0000 (11:06 -0400)]
Merge pull request #3245 from annando/issue-3242
Issue 3242: Define a maintenance reason
Hypolite Petovan [Sun, 19 Mar 2017 15:03:32 +0000 (11:03 -0400)]
Merge pull request #3243 from annando/1702-null-date
Datetime compatibility to MySQL restored
Michael [Sun, 19 Mar 2017 14:57:36 +0000 (14:57 +0000)]
Standards, like always
Michael [Sun, 19 Mar 2017 14:43:24 +0000 (14:43 +0000)]
Some more standards
Michael [Sun, 19 Mar 2017 13:24:07 +0000 (13:24 +0000)]
Issue 3242: Define a maintenance reason
Michael [Sun, 19 Mar 2017 08:06:02 +0000 (08:06 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
Michael [Sun, 19 Mar 2017 08:04:04 +0000 (08:04 +0000)]
Standards, what else?
rabuzarus [Sat, 18 Mar 2017 23:51:57 +0000 (00:51 +0100)]
Merge pull request #3244 from annando/bugfix-text
You shouldn't use a text variable like an array.
Michael [Sat, 18 Mar 2017 23:32:59 +0000 (23:32 +0000)]
You shoudln't use a text variable like an array.
Michael [Sat, 18 Mar 2017 12:13:43 +0000 (12:13 +0000)]
Some standards
Michael [Sat, 18 Mar 2017 11:42:54 +0000 (11:42 +0000)]
From now on we are using 0001-01-01 as lowest date
Michael [Sat, 18 Mar 2017 08:54:25 +0000 (08:54 +0000)]
Some more unneeded changes reverted
Michael [Sat, 18 Mar 2017 08:50:27 +0000 (08:50 +0000)]
"dob" is not a date field, so the changes are reverted
Michael [Sat, 18 Mar 2017 08:31:43 +0000 (08:31 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
Tobias Diekershoff [Sat, 18 Mar 2017 08:10:03 +0000 (09:10 +0100)]
Merge pull request #3228 from annando/1702-detect-server
Server type detection is improved
rabuzarus [Sat, 18 Mar 2017 03:41:54 +0000 (04:41 +0100)]
more standards work
Michael [Fri, 17 Mar 2017 19:25:01 +0000 (19:25 +0000)]
Standards and some logging improvements
rabuzarus [Fri, 17 Mar 2017 18:10:48 +0000 (19:10 +0100)]
some code cleanup
rabuzarus [Fri, 17 Mar 2017 16:57:57 +0000 (17:57 +0100)]
more work on standards compliance
Michael [Fri, 17 Mar 2017 15:53:19 +0000 (15:53 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
Conflicts:
include/discover_poco.php
rabuzarus [Fri, 17 Mar 2017 12:22:23 +0000 (13:22 +0100)]
Merge pull request #3226 from annando/1702-only-worker
The worker is now the only background processing system
rabuzarus [Fri, 17 Mar 2017 12:20:56 +0000 (13:20 +0100)]
Merge pull request #3240 from annando/bugfix-dba
Bugfix: When a query fails we mustn't use the result value.
Michael [Thu, 16 Mar 2017 21:34:53 +0000 (21:34 +0000)]
Better version transformation for nodeinfo and statistics.json
rabuzarus [Thu, 16 Mar 2017 19:15:25 +0000 (20:15 +0100)]
add dop event & fix event edit
Michael [Thu, 16 Mar 2017 09:23:12 +0000 (09:23 +0000)]
Bugfix: When a query fails we mustn't use the result value.
Michael [Thu, 16 Mar 2017 07:30:59 +0000 (07:30 +0000)]
Without only the worker queue we don't need the deliverq anymore.
Michael [Thu, 16 Mar 2017 05:51:22 +0000 (05:51 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
rabuzarus [Wed, 15 Mar 2017 23:25:16 +0000 (00:25 +0100)]
Merge pull request #3227 from annando/1703-pdo
We now support PDO
rabuzarus [Wed, 15 Mar 2017 18:53:16 +0000 (19:53 +0100)]
Merge pull request #3239 from Hypolite/issue/#3194-2
Fix wrong deferred function name
Hypolite Petovan [Wed, 15 Mar 2017 18:42:34 +0000 (14:42 -0400)]
Fix wrong deferred function name
Michael [Wed, 15 Mar 2017 13:56:17 +0000 (13:56 +0000)]
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
Michael [Wed, 15 Mar 2017 13:55:43 +0000 (13:55 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
rabuzarus [Wed, 15 Mar 2017 11:18:49 +0000 (12:18 +0100)]
Merge pull request #3236 from annando/bugfix-feed
Bugfix for pull request 3216: Feed items were mixed
Michael [Wed, 15 Mar 2017 06:00:22 +0000 (06:00 +0000)]
Standard stuff
Michael [Tue, 14 Mar 2017 21:14:09 +0000 (21:14 +0000)]
Bugfix for pull request 3216 - feed items were mixed
Michael [Tue, 14 Mar 2017 21:13:02 +0000 (21:13 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop
Michael Vogel [Tue, 14 Mar 2017 19:05:29 +0000 (20:05 +0100)]
Merge pull request #3233 from rabuzarus/20170314_-_pagination
limit pagination page buttons to max 10
rabuzarus [Tue, 14 Mar 2017 17:31:03 +0000 (18:31 +0100)]
limit pagination page buttons to max 10
Michael Vogel [Tue, 14 Mar 2017 15:30:15 +0000 (16:30 +0100)]
Merge pull request #3221 from strk/remember-openid
Fix "remember me" cookie for OpenID logins
Michael [Tue, 14 Mar 2017 15:18:56 +0000 (15:18 +0000)]
One forgotten standard
Michael [Tue, 14 Mar 2017 15:17:21 +0000 (15:17 +0000)]
Standard stuff
rabuzarus [Tue, 14 Mar 2017 12:04:47 +0000 (13:04 +0100)]
Merge pull request #3232 from Hypolite/issue/#3194-2
frio: Revert guid truncation for scrollToItem() and improve dropItem()
fabrixxm [Tue, 14 Mar 2017 09:29:03 +0000 (10:29 +0100)]
Merge pull request #3224 from annando/1702-no-old_pager
The old pager is now removed
Michael [Tue, 14 Mar 2017 07:26:15 +0000 (07:26 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
Michael Vogel [Tue, 14 Mar 2017 05:05:42 +0000 (06:05 +0100)]
Merge pull request #3200 from Hypolite/issue/#3195
Improve pagination on frio
Michael [Tue, 14 Mar 2017 04:58:05 +0000 (04:58 +0000)]
Removed debug output
Michael [Mon, 13 Mar 2017 22:16:09 +0000 (22:16 +0000)]
Daily updating the server status
Sandro Santilli [Mon, 13 Mar 2017 22:09:09 +0000 (23:09 +0100)]
Standards: add braces
(thanks @Hypolite)
Sandro Santilli [Mon, 13 Mar 2017 22:08:03 +0000 (23:08 +0100)]
Remove extra space after open parentheses
Michael Vogel [Mon, 13 Mar 2017 17:35:32 +0000 (18:35 +0100)]
Merge pull request #3213 from Hypolite/issue/#2792-2
Like behavior fix/improvements
Michael [Mon, 13 Mar 2017 17:23:02 +0000 (17:23 +0000)]
I guess, @Hypolite will still find something to change ...
Michael [Mon, 13 Mar 2017 16:18:45 +0000 (16:18 +0000)]
Embrace the braces and spaces ...
Hypolite Petovan [Mon, 13 Mar 2017 16:12:13 +0000 (12:12 -0400)]
Improve dropItem() functionality
- Drop the obsolete `#` char
- Add error case when deleting item
- Add item drop support to search items
- Add doc
Hypolite Petovan [Mon, 13 Mar 2017 16:10:03 +0000 (12:10 -0400)]
Fix scrollToItem breaking dropItem functionality
- Add doc
- Refactor function by removing double jQuery wrapping
Hypolite Petovan [Mon, 13 Mar 2017 15:53:34 +0000 (11:53 -0400)]
Merge remote-tracking branch 'friendica/develop' into develop
Michael [Mon, 13 Mar 2017 14:57:11 +0000 (14:57 +0000)]
Added documentation
Michael [Mon, 13 Mar 2017 14:37:51 +0000 (14:37 +0000)]
z_fetch_url now always returns an array
Michael [Mon, 13 Mar 2017 14:10:28 +0000 (14:10 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
rabuzarus [Mon, 13 Mar 2017 13:17:37 +0000 (14:17 +0100)]
Merge pull request #3202 from Hypolite/issue/#3107
Delete frio obsolete Colors.php library
Sandro Santilli [Mon, 13 Mar 2017 10:57:10 +0000 (11:57 +0100)]
Only remove the "remember me" cookie at submitting the auth form
Fixes loss of remember (Friendica) cookie on switching Managed accounts
Michael [Mon, 13 Mar 2017 10:21:35 +0000 (10:21 +0000)]
Merge branch 'master' of github.com:annando/friendica
Michael [Mon, 13 Mar 2017 10:21:08 +0000 (10:21 +0000)]
Merge remote-tracking branch 'upstream/master'
Michael [Mon, 13 Mar 2017 10:18:56 +0000 (10:18 +0000)]
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
Michael [Mon, 13 Mar 2017 10:18:29 +0000 (10:18 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
Michael [Mon, 13 Mar 2017 08:54:27 +0000 (08:54 +0000)]
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
Michael [Mon, 13 Mar 2017 08:53:57 +0000 (08:53 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
Tobias Diekershoff [Mon, 13 Mar 2017 07:26:43 +0000 (08:26 +0100)]
Merge pull request #3223 from annando/1702-no-language
The language string isn't displayed anymore
Tobias Diekershoff [Mon, 13 Mar 2017 06:52:38 +0000 (07:52 +0100)]
Merge pull request #3225 from annando/1702-no_old_share
The old share option is removed
Michael [Mon, 13 Mar 2017 06:32:33 +0000 (06:32 +0000)]
One error, one documentation, one brace
Michael [Mon, 13 Mar 2017 06:09:00 +0000 (06:09 +0000)]
Remove redundancies.
Michael [Mon, 13 Mar 2017 05:57:37 +0000 (05:57 +0000)]
more spaces
Michael [Mon, 13 Mar 2017 00:09:32 +0000 (00:09 +0000)]
Standard stuff
Michael [Mon, 13 Mar 2017 00:03:27 +0000 (00:03 +0000)]
Querying via nodeinfo
Michael [Sun, 12 Mar 2017 22:24:06 +0000 (22:24 +0000)]
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
Michael [Sun, 12 Mar 2017 21:57:09 +0000 (21:57 +0000)]
Changes from previous pull request applied again
Michael [Sun, 12 Mar 2017 21:05:10 +0000 (21:05 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1703-pdo
Michael [Sun, 12 Mar 2017 21:03:44 +0000 (21:03 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
Conflicts:
include/onepoll.php
include/queue.php
Michael [Sun, 12 Mar 2017 20:54:28 +0000 (20:54 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
Conflicts:
include/onepoll.php
Michael [Sun, 12 Mar 2017 20:52:48 +0000 (20:52 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share
Michael [Sun, 12 Mar 2017 20:52:14 +0000 (20:52 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
Conflicts:
mod/profile.php
projects / friendica.git / log