Commit Graph

228 Commits

Author SHA1 Message Date
Roland Häder fb676335db Coding convention applied:
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:10:33 +01:00
Roland Häder 884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:27:16 +01:00
Roland Häder 46d383369c Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:41:33 +01:00
Roland Häder 6de232c60a Cleanup for #3010 - removed all redundant lines found by @rabuzarus
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:31:27 +01:00
Roland Häder 63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php
2016-12-13 11:00:44 +01:00
Roland Häder 6a8a36f12d More usage of dbm::is_result($r) instead of count($r):
- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:44:13 +01:00
Michael 126c4774c3 Merge remote-tracking branch 'upstream/develop' into 1607-performance
Conflicts:
	include/dbstructure.php
	mod/item.php
	mod/nodeinfo.php
2016-11-16 06:27:21 +00:00
Michael 4d966e1e21 Changed priority for onepoll/further enhancement for dbclean 2016-10-31 21:32:08 +00:00
Michael Vogel 60a0235af0 The account type is now read and displayed 2016-10-01 20:03:27 +00:00
Michael Vogel 196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
Roland Haeder c825cc8d0d
This merge brings back dbm::is_result() where I could find it.
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:21:18 +02:00
Michael Vogel 668da905e2 "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
Michael Vogel 4e02b80868 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-07-26 22:16:37 +02:00
Michael Vogel 4961fb3a45 Unused indexes removed, queries changed 2016-07-26 22:10:13 +02:00
Tobias Diekershoff 18a35e9ceb Merge pull request #2688 from rabuzarus/2607-drop
frio: provide confirm modal
2016-07-26 10:45:52 +02:00
rabuzarus 694637f9c3 frio: provide confirm modal 2016-07-26 10:36:34 +02:00
rabuzarus 768d10536f frio: templates for contact_edit and crepair 2016-07-26 09:09:40 +02:00
rabuzarus 073f520cee add missing strings for frio 2016-06-25 12:21:13 +02:00
rabuzarus ca269b6329 unify heading of search results to "results for:" 2016-06-11 10:44:52 +02:00
Roland Haeder 3e701b90ac
Continued rewriting:
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:24:44 +02:00
rabuzarus b93326bb23 contactedit-actions-button: use internal links instead of full links 2016-02-23 19:26:03 +01:00
rabuzarus 0db83b9586 contactedit-actions-button: move repair back to tabbar 2016-02-23 19:19:45 +01:00
Michael Vogel 7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
rabuzarus 743f2e0391 Merge develop into 0602_contact_profile
Conflicts:
	mod/contacts.php
2016-02-09 13:44:30 +01:00
rabuzarus c1c21ada0a contactedit-actions-button: remove contact tabs which aren't needed anymore 2016-02-08 23:51:51 +01:00
rabuzarus 0c764684bb Merge develop into 0602_contact_profile 2016-02-08 23:16:02 +01:00
rabuzarus 0b5d7b300e contactedit-actions-button: adjust the themes and template polishing 2016-02-08 23:15:20 +01:00
rabuzarus cc18fd7ad9 contactedit-actions-button: doing some availability checks for the actions 2016-02-08 15:00:53 +01:00
rabuzarus 991cbd604a contact-edit-actions-button: initial commit 2016-02-08 01:56:15 +01:00
fabrixxm b202e02fbf Revert "Updated modules to allow for partial overrides without errors"
This reverts commit db949bb802.
2016-02-07 15:11:34 +01:00
Andrej Stieben db949bb802 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.
2016-02-05 21:52:39 +01:00
Michael Vogel 78e79de7c9 New central function to store avatar data in contacts 2016-01-28 11:09:08 +01:00
Michael Vogel 6f662b8c74 New avatar picture fields to better cope with changing avatars 2016-01-28 01:26:19 +01:00
Michael Vogel d3bf80a1f3 Show contact posts by searching for "contact-id" - not "gcontact-id" 2016-01-27 11:16:56 +01:00
Tobias Diekershoff 080319d82d issue #2270 2016-01-20 17:52:58 +01:00
Michael Vogel 6b85fa17bb Added some documentation 2016-01-10 19:06:34 +01:00
Michael Vogel 885dc1df81 gcontact update script, rebuilt follow page, query speedup for community and network groups 2016-01-10 09:19:00 +01:00
Michael Vogel 300007a0cf Bugfix: Posts weren't always shown for feeds that start with "www." 2015-12-10 22:47:58 +01:00
Michael Vogel 1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
Conflicts:
	mod/contacts.php
	mod/crepair.php
2015-12-03 14:38:04 +01:00
Michael Vogel 4286225f37 Added/Changed accesskeys for the new tab actions 2015-12-02 07:56:10 +01:00
Michael Vogel 7ed73a06ab Solved a problem with author links that are different from what is provided in the contact 2015-12-01 23:51:34 +01:00
Michael Vogel c45b16d2a1 Unifying the texts. 2015-12-01 19:02:03 +01:00
rabuzarus 89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
Michael Vogel 06a4b0dc5e Header removed in the contact area 2015-12-01 18:21:05 +01:00
Michael Vogel 1c93729c46 Tab is added to "all friends" and "common friends" 2015-12-01 08:12:05 +01:00
Michael Vogel 0278e60664 Merge pull request #2104 from rabuzarus/2611_contacts_directory
display contact information in contact and directory according to the…
2015-11-30 18:07:35 +01:00
Michael Vogel 8c35304013 Some SQL improvements 2015-11-30 08:25:11 +01:00
Michael Vogel a638417ab5 Show contact comments in the post 2015-11-29 23:46:10 +01:00
Michael Vogel 91011b7190 Removing of useless code 2015-11-29 23:36:19 +01:00
Michael Vogel a7ea6ef096 Use the template for the header. 2015-11-29 23:33:32 +01:00