1
0
Fork 0
Commit graph

399 commits

Author SHA1 Message Date
Hypolite Petovan
d9c6417f5d Remove construct_acl_data() 2018-01-04 12:19:06 -05:00
Hypolite Petovan
1724dd3841 Make validate_url more intuitive
- Remove the parameter passed by reference
- Add modified url in return value
2017-12-29 21:55:13 -05:00
Hypolite Petovan
4fe8dab08d Remove include/group.php 2017-12-09 13:45:54 -05:00
Hypolite Petovan
abdecd2b2f Use new Model methods for groups 2017-12-09 13:45:17 -05:00
Hypolite Petovan
bc58e8d3be Rename Model\GlobalContact to Model\GContact 2017-12-07 23:57:56 -05:00
Michael Vogel
5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Hypolite Petovan
cd84bf8963 Rename Model\GlobalContact to Model\GContact 2017-12-07 09:09:28 -05:00
Adam Magness
b1d16fbdf7 Update use statements
update use statements for rename to singular.
2017-12-04 09:04:36 -05:00
Adam Magness
6e5471def3 Rename to singular
Rename and update references. Standards and a require_once.
2017-12-04 09:01:27 -05:00
Adam Magness
2f0da29c75 Features to src
Move Features to class in Friendica\Content namespace. Update function calls and references.
2017-12-04 08:33:49 -05:00
Hypolite Petovan
1eb8355ac8 Fix wrong condition
Grmbl
2017-12-03 08:37:01 -05:00
Hypolite Petovan
3359f3f5c7 Fix formatting in mod/settings 2017-12-03 08:36:39 -05:00
Adam Magness
9a4e741d1a Review Changes
renamed some functions and adjusted corresponding calls.
2017-12-01 21:05:06 -05:00
Adam Magness
6008e3df11 Email to src
Create Email class and update/rename functions and function calls.
2017-12-01 14:41:27 -05:00
Hypolite Petovan
2196a0577b Remove unused upubkey and uprvkey from queries
- Switched queries to new dba::* functions
2017-11-26 14:55:47 -05:00
Hypolite Petovan
ec6f5193e2 Switch to User::authenticate
- Removed hash('whirlpool') to check password
2017-11-26 14:46:08 -05:00
8cd21269ff The last of the big workers moved ... delivery and notifier 2017-11-19 18:59:55 +00:00
2de457489f "CreateShadowentry" and "ProfileUpdate" now moved as well 2017-11-19 16:59:37 +00:00
Hypolite Petovan
2336fa9d74 Add smart_threading user setting 2017-11-19 00:57:31 -05:00
925d2d2383 Directory moved 2017-11-18 07:59:30 +00:00
Adam Magness
259f91caa9 PortableContact created
Create PortableContact and remove socgraph, update references, and calls
2017-11-15 10:53:16 -05:00
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
5a6fa4ae87 Some more 2017-11-07 21:53:11 +00:00
930309d2ec Merge remote-tracking branch 'upstream/develop' into worker-class 2017-11-05 17:23:53 +00:00
478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
9c78938ca9 Improved "if" construct 2017-11-04 21:27:32 +00:00
2894214347 Misspelled "detailed" 2017-11-04 12:08:12 +00:00
7de3eae8d0 There is now a user switch to change between condensed and detailled notifications 2017-11-04 12:01:08 +00:00
0695fa699c Removed "service class" functionality 2017-10-18 21:44:27 +00:00
6d7ececc42 Bugfix for pictures that weren't stored / reworked database calls 2017-09-15 19:41:30 +00:00
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
b5f58d317e there was a string not marked for translation 2017-07-14 15:21:08 +02:00
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
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
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
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
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
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
5f71da5862
added more curly braces + spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
958c24e9f3
spaces -> tab + added spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
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
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
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
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
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
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
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
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
c86f09a894 added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:03 +01:00
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
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
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
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
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
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
7ad4a8ca93 The warning if a group contains members of several network types can now be supressed. 2016-11-20 12:09:18 +00:00
f9911637e3 help text for settings should be translateable 2016-11-10 10:21:24 +01:00
Michael Vogel
4996003800 Merge pull request #2874 from Hypolite/bug/fix-pgettext-typo
Fix pgettext function name typo
2016-10-25 22:31:59 +02:00
Hypolite Petovan
2fc2a1a228 Fix typo in get_available_languages function name
- Add Doxygen comment block
- Fix formatting
- Renamed variable for faster understanding
2016-10-24 22:17:02 -04:00
Hypolite Petovan
9ef63efa1c Leave formatting alone 2016-10-24 16:16:49 -04:00
Hypolite Petovan
fb75394766 Some more formatting reverts 2016-10-24 12:43:38 -04:00
Hypolite Petovan
8787587011 Fix undiscriminate spaces=>tabs replace 2016-10-24 12:34:10 -04:00
Hypolite Petovan
789e1f4275 Revert some more unwarranted formatting 2016-10-24 12:27:27 -04:00
Hypolite Petovan
a843858654 Merge from develop 2016-10-08 13:45:14 -04:00
rabuzarus
2a3e235f9a show/hide page-flags according to the account-type 2016-10-05 14:45:19 +02:00
Hypolite Petovan
d9a5554543 Fix Issue #2822 - Add new setting to user settings page
- Convert formatting to PSR-2
- Add new bandwitdh saver setting
2016-10-02 15:25:10 -04:00
Michael Vogel
2f06e9360f "Company" is now "Organisation" and there is an auto update 2016-09-26 19:35:01 +00:00
Michael Vogel
d632d282cd We are now having an account type and are publishing it 2016-09-25 20:37: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
Michael Vogel
668da905e2 "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
rabuzarus
82b6917c5f frio: settings_display.tpl + rise frio to 0.2 Alpha 2016-06-13 10:57:42 +02:00
Michael Vogel
de431e185e New function to update the global contact for the user id. 2016-05-05 15:08:05 +02:00
Michael Vogel
3df235e5bd The global contact for server users is now stored directly 2016-05-05 12:02:51 +02:00
Michael Vogel
8992577bb6 Better handling of hidden profiles 2016-05-04 09:30:55 +02:00
2a864d889e missing include file for the SocNet settings 2016-03-12 16:25:17 +01:00
Michael Vogel
4ef33b4d5b Clarification of description 2016-03-06 13:26:30 +01:00
Michael Vogel
8752ec11b2 Central function for default group, special setting for OStatus 2016-03-06 13:15:27 +01: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
rabuzarus
c1ed2bd975 feature management for admins: Merge branch 'devolop' 2016-01-17 03:25:17 +01:00
Michael Vogel
f406e5ddbd Issue 1921: Disable the auto update 2015-12-06 00:18:59 +01:00
fabrixxm
fb3ac68cc0 Add user language in settings, use that field as language for UI 2015-11-08 14:23:49 +01:00
d6beb7db1f add a header to seperate the beginning of week settings 2015-10-01 06:19:57 +02:00
Michael Vogel
389b7de451 Setting for the first day of the week 2015-09-30 19:18:13 +02:00
Michael Vogel
5ac38b7f99 There is now only one central parameter for the global directory. 2015-09-15 22:29:02 +02:00
Michael Vogel
cecbc58729 Mass-subscribing to OStatus contacts is enabled again 2015-09-05 10:32:10 +02:00
Michael Vogel
3cccb5ecb1 The repair option is added to the settings 2015-09-05 04:54:48 +02:00
Michael Vogel
86f2eb005f There seems to be a problem with the function to add all friends of a GNU Social account. So it is deactivated by now. 2015-08-26 22:46:59 +02:00
Michael Vogel
b0ddde22c0 By entering a GNU Social account name, the friends of this contact will be added to the friendica account 2015-08-23 22:21:15 +02:00
86f6532c61 adding the subdir 2015-08-17 08:20:19 +02:00
03e81b06d5 we dont need the or anymore 2015-08-17 07:24:48 +02:00
621dec1606 reconstruct the description for more flexible translations 2015-08-17 07:20:50 +02:00
eea258f74c add the profile url to the settings pages as alternative to the webfinger. See issue 1621 2015-08-16 22:39:08 +02:00
Michael Vogel
b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
Michael Vogel
5f89cb0923 The autofollow option is moved from the addons to the core. 2015-07-12 21:37:49 +02:00
rabuzarus
cf2a90dfa2 system settings is now a variable in settings_display.tpl 2015-06-30 14:51:14 +02:00
rabuzarus
8cca849c2e Merge acl-var into develop
Conflicts:
	mod/settings.php
2015-06-27 15:23:19 +02:00
rabuzarus
5ce125d6e0 cleanup of some unused code 2015-06-26 15:13:52 +02:00
Fabrixxm
4036ad2554 Fix desktop notification
use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification
2015-06-24 09:49:53 +02:00
Michael Vogel
472a6f1380 Added explanation for shortening. 2015-05-15 21:09:00 +02:00
Michael Vogel
d995fc3994 The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled. 2015-05-15 20:56:05 +02:00
8367cadeef dont normalise OpenID URLs and fallback to https if no protocol is specified 2015-04-14 12:27:36 +02:00
106b0b5d23 Merge pull request #1460 from FlxAlbroscheit/develop
Issue 1163: Feature allowing desktop-notifications
2015-04-05 11:37:05 +02:00
fabrixxm
0226258e7b Block settings page for unauthorized users
fixes issue #1459
2015-03-31 10:24:23 +02:00
FlxAlbroscheit
001e940c6c Feature for desktop-notifications
see issue #1163
2015-03-31 02:06:07 +02:00
eaaed02ffd use type email in users settings as well 2015-01-24 09:40:01 +01:00
fabrixxm
816d3f86e7 reword checkbox help text 2015-01-20 22:17:03 +01:00
fabrixxm
b2527039b7 add text-only email option
add a checkbok to notification settings. if checked, html body is not added to email.
2015-01-20 19:19:58 +01:00
Michael Vogel
086b3e30c6 Clarification for the hidewall property. 2014-12-12 23:03:23 +01:00
Fabrixxm
fbe664cc44 fix settings page aside menu active item
add aside menu to delegate page
2014-09-17 11:00:34 +02:00
Michael Vogel
1a865bf400 New description for the option to reload the page only when on top. 2014-08-01 20:11:56 +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
c980e6d20d Possibility to disable the automatic reload of the network page 2014-07-09 21:32:32 +02:00
Michael Vogel
2db1029830 APC support is removed due to problems with PHP 5.5. 2014-05-03 12:02:25 +02:00
Michael Vogel
2846dfeb05 Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values. 2014-04-26 02:22:30 +02:00
Michael Vogel
30efb0c1e6 menu entry for "Delegations" moved to the settings. 2014-04-24 10:16:02 +02:00
Michael Vogel
5f3d584716 Code beautification and some more logging data - no changes in the functionality. 2014-04-04 11:02:36 +02:00
Michael Vogel
6e7bd68ebb More "LIMIT 1" removed - and some other SQL improvements. 2014-03-11 23:52:32 +01:00
Michael Vogel
70e017745a Just some code beautification. 2013-12-02 00:41:59 +01:00
Michael Vogel
e0cf2c5167 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/admin.php
	mod/settings.php
2013-12-02 00:33:46 +01:00
Michael Vogel
6684107b66 multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma. 2013-12-02 00:11:31 +01:00
9144dd3780 rename some fields to fix issue #775 2013-11-17 16:45:24 +01:00
4101127c01 better worting of the SUBMIT button in the settings tab and the admin panel 2013-11-17 15:22:11 +01:00
Fabrixxm
0414e0a316 More "relocate":
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
2013-11-13 06:07:49 -05:00
Michael Vogel
693b6d0fd4 Infinite scroll: At the end of the network page new content is loaded automatically 2013-10-15 00:43:11 +02:00
Michael Vogel
ab7d8bc6ab Delete all APC values before showing them in the settings and admin section 2013-09-27 23:02:59 +02:00
friendica
115c8a53bf issue546 via Tobias 2013-04-23 18:58:52 -07:00
b6d1a1f125 tabwidth 2013-04-14 18:19:01 +02:00
4dd406055c check password when changing users email 2013-04-14 17:58:16 +02:00
5827db0ea3 check current password before changing the password 2013-04-14 17:22:42 +02:00
friendica
9660117c70 sync username when changed in either the default profile or the settings page 2013-04-04 15:10:14 -07:00
Michael Vogel
86e19dda22 Vier: Some more changes to the theme.
Added a switch to suppress displaying of the tags.
2013-03-05 00:46:11 +01:00
Zach Prezkuta
488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00