Commit Graph

120 Commits

Author SHA1 Message Date
Hypolite Petovan 7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Häder d9c22c7f3e
Continued a bit:
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder 0cd241bcbe
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:44:40 +01:00
Tobias Diekershoff 2fa9f76e67 better wording and placeholder for name 2017-03-03 10:28:29 +01:00
Tobias Diekershoff 7442ce3d6d change Fan/Admirer to Subscriber 2017-02-26 16:47:11 +01:00
Hypolite Petovan f92918f471 Normalize App parameter declaration (mod folder, 2 out of 3) 2017-01-09 23:14:25 +11:00
Roland Häder f42d768586 Merge remote-tracking branch 'upstream/develop' into rewrites/dbm_is_result 2016-12-22 09:04:27 +01:00
rabuzarus 2fcbba9410 provide local time for notifications 2016-12-22 00:28:52 +01:00
rabuzarus 125d2f24dd frio: add profile link to the notifications url 2016-12-21 23:17:55 +01:00
Roland Häder e24c3a5b82 added much more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:56:34 +01:00
Roland Häder 4dce3d8224 changed to this:
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:58:55 +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 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 1c31526d6e HTML entities in Notifications aren't a problem anymore 2016-08-11 19:59:07 +02:00
rabuzarus 0532dc6a61 notifications - correct boolean variable checking 2016-08-07 12:26:49 +02:00
rabuzarus de02154a1b notifications - set default values for some varibles 2016-08-06 18:59:39 +02:00
rabuzarus ce3188d5c6 notifications - move intros to NotificationsManager & make json output work 2016-08-03 12:44:04 +02:00
rabuzarus 6d3c15fe91 notifications - add attendance notifications 2016-08-02 00:01:43 +02:00
rabuzarus bcee356f66 notifications - add docu & pagination 2016-08-01 23:04:41 +02:00
rabuzarus 7a4be1cead notifications.php: move more code to NotificationsManager 2016-08-01 18:18:11 +02:00
trebor 52f641904b notifications.php: reduce code duplication 2016-07-30 10:51:21 +02:00
rabuzarus f09cd57165 notifications.php - move duplicated code in an own function 2016-07-28 11:39:09 +02:00
rabuzarus 819b374401 notifications.php - move some template creation to the end of the file 2016-07-27 21:07:54 +02:00
rabuzarus 320751660d frio: intro notifications + some restructuring in core for notifications 2016-07-27 19:53:22 +02:00
Michael Vogel 0b1188b7fe Imrpoved avatar handling when storing them/partly use of "micro" 2016-06-25 13:56:55 +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
Michael Vogel 7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +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 1f0b759e2f Added resize possibility to proxy function 2015-10-07 08:25:10 +02:00
Michael Vogel 14e17b944f Reworked fetching of contact data on "display" page 2015-10-06 18:31:08 +02:00
Michael Vogel eefedc019b Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy 2015-10-06 07:41:09 +02:00
Michael Vogel 901b95e935 Hide some profile data if not connected. 2015-10-06 06:56:31 +02:00
Michael Vogel 7ed61b2edc Removed "proxy_parse_html" since it is now done in the bbcode function. 2015-10-05 22:25:14 +02:00
Michael Vogel 8a2d1fe301 Show RedMatrix and use the proxy for the profile pictures 2015-10-04 22:24:58 +02:00
Michael Vogel 8c514307cf For safety reasons include the include 2015-10-04 17:20:47 +02:00
Michael Vogel 4003b9cc5d Let the notification look more like the follow dialog 2015-10-04 17:18:58 +02:00
Michael Vogel 83ea4f7253 transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues. 2015-10-04 15:55:24 +02:00
Michael Vogel d0ae5ce326 Show more information when following a new contact 2015-10-04 14:41:39 +02:00
Michael Vogel c7b80b532a Bugfix: The "about" field in the introductions should be send through bbcode 2015-09-25 17:47:37 +02:00
Michael Vogel a0f69dc92c Contact requests now contain more information. 2015-08-12 08:07:21 +02:00
Michael Vogel b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
fabrixxm 2d3437daa3 different help text for different network 2015-04-04 18:02:26 +02:00
Silke Meyer c05f95b54e Improved help text, issue 1349. 2015-04-01 10:10:00 +02:00
Silke Meyer cdd3089444 Help text sounded too complicated 2015-02-04 16:43:31 +01:00
Silke Meyer 6bccf0be79 Added help text as requested in #1349. 2015-02-04 16:13:07 +01:00
Fabrixxm f971f52482 remove messages link from notification tabs bar 2014-09-17 11:01:47 +02:00
Michael Vogel ed1dce93d6 Usage of /display/(guid) as path instead of /display/(user)/(id)
Bugfix for adding tags to photos
2014-07-22 00:36:20 +02:00
Michael Vogel 6e7bd68ebb More "LIMIT 1" removed - and some other SQL improvements. 2014-03-11 23:52:32 +01:00
Michael Vogel b0dd16696a Solving some more SQL warnings ("limit" must never be used in update statements) 2013-12-02 20:30:24 +01:00