git.mxchange.org Git - friendica.git/log

Roland Haeder [Fri, 14 Apr 2017 13:23:10 +0000 (15:23 +0200)]

removed some parentheses, but left them in where a string was concated

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Fri, 14 Apr 2017 13:14:39 +0000 (15:14 +0200)]

Continued a bit:
- rewrote 2 multi-line single comments to one multi-line comment
- added TODO for rewriting function to closure (CR request)

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Fri, 14 Apr 2017 13:11:45 +0000 (15:11 +0200)]

fixed spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Fri, 14 Apr 2017 13:10:56 +0000 (15:10 +0200)]

CR: added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 22:28:24 +0000 (00:28 +0200)]

opps, missed this one.

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 18:09:31 +0000 (20:09 +0200)]

not on develop was this code in, but here? :-/

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 18:08:22 +0000 (20:08 +0200)]

huh? missed again

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 18:07:28 +0000 (20:07 +0200)]

more spaces! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 18:06:48 +0000 (20:06 +0200)]

more curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 18:05:32 +0000 (20:05 +0200)]

more spaces + curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 18:04:24 +0000 (20:04 +0200)]

added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 18:03:21 +0000 (20:03 +0200)]

added curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 18:00:54 +0000 (20:00 +0200)]

more spaces and curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:50:29 +0000 (19:50 +0200)]

curly braces were missing again ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:48:57 +0000 (19:48 +0200)]

more spaces again ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:44:42 +0000 (19:44 +0200)]

some more spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:43:01 +0000 (19:43 +0200)]

added curly braces + spaces (CR)

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:39:39 +0000 (19:39 +0200)]

added spaces (CR)

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:38:40 +0000 (19:38 +0200)]

again develop and this branch differs ... (no blame on cherry-picking though)

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:36:38 +0000 (19:36 +0200)]

opps, was somehow missed to cherry-pick/merge ?

+ converted multiple single-line comments into one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:31:48 +0000 (19:31 +0200)]

Opps!

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:30:35 +0000 (19:30 +0200)]

Cleanups:
- made SQL keywords all uper-case
- put all SQL columns in back-ticks
- added curly braces
- added/removed spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:20:01 +0000 (19:20 +0200)]

more spaces + curly braces ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:17:20 +0000 (19:17 +0200)]

removed spaces ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:12:31 +0000 (19:12 +0200)]

huh? was in develop branch but not here?

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:11:45 +0000 (19:11 +0200)]

no spaces here ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:10:41 +0000 (19:10 +0200)]

more spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 17:05:50 +0000 (19:05 +0200)]

added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please
note that PHP5 allows 'array' as type-hint already (+ interface/class name).

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 16:51:29 +0000 (18:51 +0200)]

more spaces + curly braces + converted multiple single-line comments to one mult-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Sat, 8 Apr 2017 16:49:01 +0000 (18:49 +0200)]

fixed spacing + intending

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Häder [Sat, 8 Apr 2017 16:45:59 +0000 (18:45 +0200)]

Merge branch 'develop' into rewrites/coding-convention-split2-1-2

commit | commitdiff | tree

Tobias Diekershoff [Sat, 8 Apr 2017 13:24:16 +0000 (15:24 +0200)]

Merge pull request #3306 from Hypolite/issue/#3274

Fix path to default Text_Highlighter CSS

commit | commitdiff | tree

Hypolite Petovan [Sat, 8 Apr 2017 12:59:41 +0000 (08:59 -0400)]

Fix path to default Text_Highlighter CSS

commit | commitdiff | tree

Hypolite Petovan [Sat, 8 Apr 2017 11:49:12 +0000 (07:49 -0400)]

Merge pull request #3305 from rabuzarus/20170408_-_fix_frio_css_nav_account_button

Bugfix: there was a gui issue on the navbar account dropdown button

commit | commitdiff | tree

rabuzarus [Sat, 8 Apr 2017 11:30:16 +0000 (13:30 +0200)]

Bugfix: there was a gui issue on the navbar account dropdown button

commit | commitdiff | tree

rabuzarus [Sat, 8 Apr 2017 11:20:46 +0000 (13:20 +0200)]

Merge pull request #3303 from annando/1704-duplicate-feed

Avoid duplicates with feeds and "remote self"

commit | commitdiff | tree

Michael [Sat, 8 Apr 2017 10:05:01 +0000 (10:05 +0000)]

Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed

commit | commitdiff | tree

Michael [Sat, 8 Apr 2017 08:12:14 +0000 (08:12 +0000)]

Avoid duplicates with feeds and "remote self"

commit | commitdiff | tree

rabuzarus [Fri, 7 Apr 2017 21:48:32 +0000 (23:48 +0200)]

Merge pull request #3301 from annando/issue-3300

The temp path creation couldn't create a subdirectory with the hostname

commit | commitdiff | tree

Michael [Fri, 7 Apr 2017 21:34:06 +0000 (21:34 +0000)]

Issue 3300: The temp path creation couldn't create a subdirectory with the hostname

commit | commitdiff | tree

Michael Vogel [Fri, 7 Apr 2017 20:59:44 +0000 (22:59 +0200)]

Merge pull request #3295 from Hypolite/issue/#3274

Friendica code blocks aren't rendered in Diaspora

commit | commitdiff | tree

fabrixxm [Fri, 7 Apr 2017 12:31:28 +0000 (14:31 +0200)]

Merge pull request #3298 from tobiasd/20170407-quattroadin

the Quattro admin_user template was missing the users note for the admin

commit | commitdiff | tree

Tobias Diekershoff [Fri, 7 Apr 2017 10:59:22 +0000 (12:59 +0200)]

the Quattro admin_user template was missing the users note for the admin

commit | commitdiff | tree

Tobias Diekershoff [Fri, 7 Apr 2017 09:45:00 +0000 (11:45 +0200)]

Merge pull request #3297 from rabuzarus/20170407_-_fix_bulk_deletion_button

Bugfix: bulk deletion button was not available anymore

commit | commitdiff | tree

rabuzarus [Fri, 7 Apr 2017 09:41:38 +0000 (11:41 +0200)]

Merge pull request #3296 from tobiasd/20170407-isresult

small fix for #3254

commit | commitdiff | tree

rabuzarus [Fri, 7 Apr 2017 09:35:45 +0000 (11:35 +0200)]

Bugfix: bulk deletion button was not available anymore

commit | commitdiff | tree

Tobias Diekershoff [Fri, 7 Apr 2017 09:26:11 +0000 (11:26 +0200)]

commit | commitdiff | tree

Hypolite Petovan [Fri, 7 Apr 2017 04:01:46 +0000 (00:01 -0400)]

Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser

frio: fbrowser styling

commit | commitdiff | tree

Hypolite Petovan [Fri, 7 Apr 2017 03:49:56 +0000 (23:49 -0400)]

Fix code blocks to Diaspora

- Extracts code blocks before BBCode conversion to prevent code
highlighting and whitespace meddling
- Use the improved HTLM To Markdown library
- Use <code> instead of <key> for Diaspora inline code blocks

commit | commitdiff | tree

Hypolite Petovan [Fri, 7 Apr 2017 03:43:55 +0000 (23:43 -0400)]

commit | commitdiff | tree

Hypolite Petovan [Fri, 7 Apr 2017 03:33:12 +0000 (23:33 -0400)]

Move HTML to Markdown library to Composer

commit | commitdiff | tree

Hypolite Petovan [Fri, 7 Apr 2017 01:58:01 +0000 (21:58 -0400)]

Merge pull request #3294 from strk/openid-input-type-text

Add type="text" attribute for openid input field

commit | commitdiff | tree

Sandro Santilli [Thu, 6 Apr 2017 19:48:20 +0000 (21:48 +0200)]

Add type="text" attribute for openid input field

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 20:45:16 +0000 (22:45 +0200)]

unspaced ... ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 20:39:57 +0000 (22:39 +0200)]

more spaces/curly braces added

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 20:33:28 +0000 (22:33 +0200)]

added more spaces + fixed tpzo: occurence

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 20:30:12 +0000 (22:30 +0200)]

Continued a bit:
- added spaces/curly braces
- used x($foo, 'bar') instead of isset($foo['bar'])
- let's wrap html_entity_encode() somehow

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 20:23:50 +0000 (22:23 +0200)]

added more spaces (CR)

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 20:20:09 +0000 (22:20 +0200)]

Opps, fixed parser error ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 20:17:15 +0000 (22:17 +0200)]

Continued a bit:
- more spaces added
- more curly braces added
- let's use x($_FOO, 'bar') and not isset($_FOOT['bar'])

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 20:07:55 +0000 (22:07 +0200)]

overworked api.php:
- added 'new' keyword because 'throw Exception' won't work
- removed self-advertisement
- added tons of spaces
- added tons of curly braces
- removed parentheses from require/include
- more usage of dbm::is_result()
- still there is a lot todo

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Michael Vogel [Wed, 5 Apr 2017 19:39:10 +0000 (21:39 +0200)]

Merge pull request #3290 from Hypolite/issue/#3274

Add Text_highlighter to Composer

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 17:35:49 +0000 (19:35 +0200)]

added spaces + used x() the proper way

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 17:33:06 +0000 (19:33 +0200)]

added spaces (CR)

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 17:27:34 +0000 (19:27 +0200)]

added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Roland Haeder [Wed, 5 Apr 2017 17:24:22 +0000 (19:24 +0200)]

added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

rabuzarus [Wed, 5 Apr 2017 10:46:09 +0000 (12:46 +0200)]

change fbrowser image margin and box-shadow

commit | commitdiff | tree

rabuzarus [Wed, 5 Apr 2017 10:34:00 +0000 (12:34 +0200)]

add aria attributes for filebrowser

commit | commitdiff | tree

rabuzarus [Wed, 5 Apr 2017 09:46:42 +0000 (11:46 +0200)]

add aria attributes + restructure some js to change the aria attributes

commit | commitdiff | tree

Hypolite Petovan [Wed, 5 Apr 2017 04:31:49 +0000 (00:31 -0400)]

Add Text_Highlighter to Composer

- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments

Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.

commit | commitdiff | tree

Michael Vogel [Wed, 5 Apr 2017 03:21:15 +0000 (05:21 +0200)]

Merge pull request #3289 from Hypolite/improvement/add-composer

Add Composer FAQ

commit | commitdiff | tree

Hypolite Petovan [Wed, 5 Apr 2017 01:48:36 +0000 (21:48 -0400)]

Merge branch 'develop' of https://github.com/Hypolite/friendica into develop

commit | commitdiff | tree

Hypolite Petovan [Wed, 5 Apr 2017 00:34:06 +0000 (20:34 -0400)]

commit | commitdiff | tree

Roland Haeder [Tue, 4 Apr 2017 17:46:56 +0000 (19:46 +0200)]

added spaces + some curly braces + some usage of dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>

commit | commitdiff | tree

Tobias Diekershoff [Tue, 4 Apr 2017 05:50:33 +0000 (07:50 +0200)]

Merge pull request #3286 from annando/issue-1720

Issue 1720: Group filter and new tab don't like each other

commit | commitdiff | tree

Michael [Tue, 4 Apr 2017 05:39:43 +0000 (05:39 +0000)]

Some little standard stuff

commit | commitdiff | tree

Michael [Tue, 4 Apr 2017 05:35:04 +0000 (05:35 +0000)]

Issue 1720: Group filter and new tab don't like each other

commit | commitdiff | tree

Hypolite Petovan [Tue, 4 Apr 2017 02:06:09 +0000 (22:06 -0400)]

Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

commit | commitdiff | tree

rabuzarus [Mon, 3 Apr 2017 13:04:54 +0000 (15:04 +0200)]

commit | commitdiff | tree

rabuzarus [Mon, 3 Apr 2017 12:32:54 +0000 (14:32 +0200)]

use buttons for mobile jot nav

commit | commitdiff | tree

rabuzarus [Mon, 3 Apr 2017 12:20:34 +0000 (14:20 +0200)]

use box-shadow instead of border

commit | commitdiff | tree

rabuzarus [Mon, 3 Apr 2017 12:00:27 +0000 (14:00 +0200)]

add href attribute to jot links

commit | commitdiff | tree

rabuzarus [Mon, 3 Apr 2017 11:38:07 +0000 (13:38 +0200)]

use height: 0 instead of display: none to hide jot sections

commit | commitdiff | tree

rabuzarus [Mon, 3 Apr 2017 10:55:06 +0000 (12:55 +0200)]

add missing overflow to css

commit | commitdiff | tree

rabuzarus [Mon, 3 Apr 2017 10:46:31 +0000 (12:46 +0200)]

fix max-height for screens bigger than 768px

commit | commitdiff | tree

Hypolite Petovan [Mon, 3 Apr 2017 10:38:10 +0000 (06:38 -0400)]

Merge pull request #3254 from Quix0r/rewrites/coding-convention-split2

Rewrites/coding convention split2

commit | commitdiff | tree

Hypolite Petovan [Mon, 3 Apr 2017 10:35:27 +0000 (06:35 -0400)]

Merge branch 'develop' into rewrites/coding-convention-split2

commit | commitdiff | tree

Hypolite Petovan [Mon, 3 Apr 2017 02:49:07 +0000 (22:49 -0400)]

Merge pull request #3284 from annando/issue-3278

Issue 3278: Attachments in Reshares should now work

commit | commitdiff | tree

rabuzarus [Mon, 3 Apr 2017 00:04:13 +0000 (02:04 +0200)]

re-enabel browser for small screens

commit | commitdiff | tree

rabuzarus [Sun, 2 Apr 2017 22:51:34 +0000 (00:51 +0200)]

Merge develop into 20170321_-_frio-fbbrowser

Conflicts:
view/theme/frio/js/filebrowser.js
view/theme/frio/js/theme.js
view/theme/frio/templates/filebrowser.tpl
view/theme/frio/templates/jot.tpl

commit | commitdiff | tree

rabuzarus [Sun, 2 Apr 2017 21:15:57 +0000 (23:15 +0200)]

Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons

Frio: Turn action links into buttons

commit | commitdiff | tree

Michael [Sun, 2 Apr 2017 20:43:54 +0000 (20:43 +0000)]

Removed unneeded comment

commit | commitdiff | tree

Michael [Sun, 2 Apr 2017 19:18:11 +0000 (19:18 +0000)]

Issue 3278: Attachments in Reshares should now work

commit | commitdiff | tree

Hypolite Petovan [Sun, 2 Apr 2017 14:01:30 +0000 (10:01 -0400)]

Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop