de5125a4c7
merged 2 if() into one as requested by CR
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:45:49 +02:00
2a480df6fa
added spaces + removed parentheses (include/require are no functions)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:44:55 +02:00
6b8f581897
added spaces
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:42:09 +02:00
f998438d43
removed old-lost code by CR request
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:38:36 +02:00
5bc2ebb267
Please use x() correctly:
...
<?php
if (x($someArray, 'element')) {
// Do something
}
?>
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:37:08 +02:00
3d595c4dcc
Continued a bit:
...
- added spaces / curly braces
- converted multiple single-line comments into one multi-line comment
- used more dbm::is_result()
- include/require are no functions, let's not abuse them ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:33:24 +02:00
d091759888
space to the rescue ... ;-) CR request
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:34:14 +02:00
9c056d0bf0
it is ... SPACE TIME! ;-)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:30:35 +02:00
54c8fb2bb8
Replaces mcrypt with phpsec.
2017-03-30 18:29:12 +00:00
e0f4d22049
removed old-lost code by CR request + spaces added ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:26:50 +02:00
32da3b2f58
removed commented-out by CR request + it is ... SPACE TIME! ;-)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:25:31 +02:00
0ac1af7300
spaces added according code convention and CR + fixed tzpo in function name (opps)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:22:40 +02:00
Hypolite Petovan
109f851795
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons
2017-03-28 03:14:03 -04:00
Hypolite Petovan
3cb08c7458
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
2017-03-28 03:12:53 -04:00
Michael Vogel
a4255de1e2
Merge pull request #3275 from tobiasd/20170327-es
...
ES translation THX Albert
2017-03-28 06:18:58 +02:00
Hypolite Petovan
bb559aaf30
Merge pull request #3276 from annando/issue-2959
...
Reestablish the communication with Mastodon
2017-03-27 23:44:09 -04:00
Hypolite Petovan
ce4eb1deb0
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
2017-03-27 21:24:24 -04:00
4fc1ebd4ea
Doing some Hypolyzation
2017-03-27 21:02:56 +00:00
c85331d8ac
Reestablish the communication with Mastodon
2017-03-27 20:58:15 +00:00
4720778edc
ES translation THX Albert
2017-03-27 22:06:56 +02:00
8580cd87a6
Merge pull request #3271 from Hypolite/issue/#3189
...
Fix Diaspora code blocks being mangled
2017-03-27 09:26:39 +02:00
0cf000469e
Merge pull request #3272 from annando/issue-2364
...
Only import new OStatus posts if they are from our followers
2017-03-27 09:24:41 +02:00
fa7721c735
Prevent Hypolite from doing comments about standards ;-)
2017-03-27 06:11:45 +00:00
364d88fa70
Only import new OStatus posts if they are from our followers
2017-03-27 05:33:43 +00:00
Hypolite Petovan
909439e59f
Fix contacts "View" link color
...
- Fixed whitespaces in `event.tpl`
2017-03-26 19:22:19 -04:00
Hypolite Petovan
55e4bab00e
Improve babel page display for diaspora2bb mode
...
- Fix formatting
2017-03-26 19:06:22 -04:00
Hypolite Petovan
3e285a690a
Fix Diaspora code blocks being mangled
...
- Remove whitespace removal code from `diaspora2bb()`
- Add code block skipping the HTML transforms removing whitespace in
`htm2bbcode()`
2017-03-26 19:00:04 -04:00
Hypolite Petovan
b952b22735
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
2017-03-26 18:59:32 -04:00
Hypolite Petovan
9dd6998126
Merge pull request #3270 from annando/1703-no-spam
...
The "spam" libary is not in use, so we remove it completely
2017-03-26 10:35:42 -04:00
68cfe9c7fe
library/oauth.php is not in use as well.
2017-03-26 14:19:34 +00:00
a06bbd809a
The "spam" libary is not in use, so we remove it completely
2017-03-26 14:06:26 +00:00
Hypolite Petovan
8cb9d51fa8
Merge pull request #3269 from annando/1703-nodeinfo
...
We now return basic system data via nodeinfo at every time.
2017-03-26 09:24:42 -04:00
8fe1fc2f52
Remove parendingsdas
2017-03-26 13:12:02 +00:00
92f5315320
We now return basic system data via nodeinfo at every time.
2017-03-26 12:51:25 +00:00
632be78b55
Merge pull request #3267 from annando/issue-3248
...
Issue 3248: Make communityhome work again.
2017-03-26 08:03:46 +02:00
4168d47ecd
Issue 3248: Make communityhome work again.
2017-03-26 05:29:24 +00:00
Hypolite Petovan
9375438216
Restore separator margins
2017-03-25 22:58:17 -04:00
Hypolite Petovan
8db4437ed7
Restores bold text for text dropdown button
2017-03-25 21:33:34 -04:00
Hypolite Petovan
fa9ce4721a
Fix superfluous comment box top margin
2017-03-25 21:29:13 -04:00
Hypolite Petovan
c01c7ad746
Fix .btn-link hover/focus color
2017-03-25 21:28:53 -04:00
Hypolite Petovan
5b7c8d8631
Fix indent in search_item.tpl
2017-03-25 20:45:03 -04:00
Hypolite Petovan
359c246ef9
Various fixes
...
- Removed superfluous CSS rule
- Fixed whitespace
- Restored separators in search_item.tpl
2017-03-25 20:43:33 -04:00
Hypolite Petovan
d7f80bf7e7
Merge branch 'develop' into improvement/frio-action-links-to-buttons
...
# Conflicts:
# view/theme/frio/js/filebrowser.js
# view/theme/frio/templates/filebrowser.tpl
2017-03-25 20:27:26 -04:00
Hypolite Petovan
7850abcee3
Merge branch 'develop' of https://github.com/friendica/friendica into develop
2017-03-25 20:16:27 -04:00
fda99e39c1
used ltrim() for removing (any) trailing space
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 21:22:05 +01:00
b97561e0c4
added spaces
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 21:20:20 +01:00
Hypolite Petovan
632d77cfb1
Merge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser
...
Bugfix: fbrowser did insert 2 Pictures instead of only 1
2017-03-25 16:13:31 -04:00
rabuzarus
8bbf43b9dd
Remove the AjaxUpload element when jot modal is closed
2017-03-25 21:10:57 +01:00
Hypolite Petovan
d78acd5408
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons
2017-03-25 16:09:46 -04:00
Hypolite Petovan
f6ef6f0c7a
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
2017-03-25 16:09:10 -04:00
