Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-20 07:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
16451 commits 3 branches 64 tags 249 MiB
Commit graph

278 commits

Author SHA1 Message Date
Adam Magness
47db624105 GlobalContact created 
Moved DirSearch and GlobalContact related functions to Friendica\Model namespace
 2017-11-15 09:47:49 -05:00
Adam Magness
4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Michael
5a6fa4ae87 Some more 2017-11-07 21:53:11 +00:00
Michael
930309d2ec Merge remote-tracking branch 'upstream/develop' into worker-class 2017-11-05 17:23:53 +00:00
Michael
478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
Michael
9c78938ca9 Improved "if" construct 2017-11-04 21:27:32 +00:00
Michael
2894214347 Misspelled "detailed" 2017-11-04 12:08:12 +00:00
Michael
7de3eae8d0 There is now a user switch to change between condensed and detailled notifications 2017-11-04 12:01:08 +00:00
Michael
0695fa699c Removed "service class" functionality 2017-10-18 21:44:27 +00:00
Michael
6d7ececc42 Bugfix for pictures that weren't stored / reworked database calls 2017-09-15 19:41:30 +00:00
Michael
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Tobias Diekershoff
b5f58d317e there was a string not marked for translation 2017-07-14 15:21:08 +02:00
Tobias Diekershoff
de5a0dadb0 Merge pull request #3534 from AndyHee/20170609-User_settings 
Better input hints, user settings, account types
 2017-06-09 12:39:50 +02:00
Andy H3
c8f87e1c28 Updated settings.php 2017-06-09 16:21:25 +07:00
Hypolite Petovan
ad4cdf2a9d Replace lowercase operators 2017-06-08 21:03:44 -04:00
Hypolite Petovan
9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Michael
6e8e326705 Bugfix: Timeout problems when saving profile settings 2017-05-19 06:01:13 +00:00
Hypolite Petovan
20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan
472345d740 Merge branch 'develop' into space_before_t 2017-04-08 23:17:31 -04:00
rebeka-catalina
050675a629 The other lone comma in 1177 2017-04-08 18:07:30 +02:00
rebeka-catalina
554704e6b9 Added a whitespace between comma and t() 2017-04-08 16:57:24 +02:00
rebeka-catalina
d8a8fa9baa Modified the warning message 2017-04-08 16:48:11 +02:00
rebeka-catalina
7320327fa1 Deleted the lone comma between paratheses 2017-04-08 16:37:18 +02:00
rebeka-catalina
895a6254a0 Correction of 1177 and added modification to 1171 2017-04-08 15:48:15 +02:00
rebeka-catalina
bcfbfeeba4 adding space for readability 2017-04-08 13:52:37 +02:00
rebeka-catalina
4c9c83e8e8 Warning, that profile published in local directory may be visible in public 2017-04-08 13:21:35 +02:00
rebeka-catalina
892ef45474 Warning, that profile published in local directory may be visible in public 2017-04-08 13:13:38 +02:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Haeder
09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-20 20:51:32 +01:00
Roland Häder
4fe5cdf3fd don't quit silently, at least a TODO is now around 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:37 +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
Roland Häder
5f71da5862
added more curly braces + spaces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:00 +01:00
Roland Häder
958c24e9f3
spaces -> tab + added spaces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:00 +01:00
Roland Häder
63e4750b4a
more coding convention applied: 
- added curly braces
- added spaces where needed
- $r only needs to be tested with dbm::is_result()
- made SQL keywords all uper-case

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:21 +01:00
Roland Häder
1c6535c0b4
applied coding convention: 
- replaced space -> tab (code indenting)
- added curly braces
- used dbm::is_result() if $r is no result (may happen)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:21 +01:00
Michael
0afb0c2ea4 NULL_DATE is now a constant 2017-02-27 23:37:15 +00:00
Hypolite Petovan
a7ce601580 Normalize App parameter declaration (mod folder, 3 out of 3) 2017-01-09 23:14:55 +11:00
Roland Haeder
59404e4eaf
More curly braces added, left some TODOs behind 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:17:36 +01:00
Roland Haeder
536f078ed4
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:31:05 +01:00
Roland Häder
4b221d216e added more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 17:57:40 +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
51d352922a Continued: 
- added curly braces + spaces
- added todo about testing empty/non-empty strings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:39:53 +01:00
Roland Häder
c86f09a894 added spaces + curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:36:03 +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
a5e4882e25 Coding convention: 
- added curly braces
- added space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:35:28 +01:00
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
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