keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19668 commits 4 branches 0 tags 179 MiB
Commit graph

351 commits

Author SHA1 Message Date
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
Michael
7ad4a8ca93 The warning if a group contains members of several network types can now be supressed. 2016-11-20 12:09:18 +00:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
86f6532c61 adding the subdir 2015-08-17 08:20:19 +02:00
Tobias Diekershoff
03e81b06d5 we dont need the or anymore 2015-08-17 07:24:48 +02:00
Tobias Diekershoff
621dec1606 reconstruct the description for more flexible translations 2015-08-17 07:20:50 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
8367cadeef dont normalise OpenID URLs and fallback to https if no protocol is specified 2015-04-14 12:27:36 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
9144dd3780 rename some fields to fix issue #775 2013-11-17 16:45:24 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
b6d1a1f125 tabwidth 2013-04-14 18:19:01 +02:00
Tobias Diekershoff
4dd406055c check password when changing users email 2013-04-14 17:58:16 +02:00
Tobias Diekershoff
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
Zach Prezkuta
11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
Zach Prezkuta
96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Michael Vogel
9ab34f8857 mail: "reply-to" now triggers the "sender"-header instead of the "reply-to"-header. 2012-12-18 00:47:55 +01:00
Zach Prezkuta
94204d9160 implement features 2012-11-22 09:14:22 -07:00
Zach Prezkuta
f4f3c8375f send less messages to server; remove delete option 2012-09-29 17:50:34 -06:00
Zach Prezkuta
63d02d98c5 add settings sections and add contacts; other tweaks and fixes 2012-09-07 12:17:03 -06:00
Zach Prezkuta
77529ccdf1 allow individual choice of mobile themes 2012-09-06 17:24:34 -06:00
Zach Prezkuta
c681e69794 limit number of items on profile page too; add show more back to Frost mobile; some show more fixes 2012-08-26 15:21:26 -06:00
Zach Prezkuta
1f09e7ad23 Modify Javascript to improve page loading times 
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
 2012-07-28 09:57:16 -06:00
friendica
a54278649f poke notifications 2012-07-19 20:13:40 -07:00
friendica
b02c733967 service class restrict the email connector 2012-06-26 18:30:20 -07:00
friendica
1180919c89 some zero theming on settings page 2012-05-30 16:30:51 -07:00
friendica
bdcb8d27dd transition to beta for private forums 2012-05-30 15:52:17 -07:00
friendica
52995e0b1f private group fix 2012-05-29 18:14:21 -07:00
friendica
2eafa9a475 ability to only expire contacts, not self 2012-05-29 01:14:53 -07:00
friendica
2dc7e53435 more theme cleanup 2012-05-28 19:17:06 -07:00
friendica
2bd1004587 rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. 2012-05-27 21:01:58 -07:00
friendica
34b79b4f2b theming for default group selector 2012-05-18 01:38:11 -07:00
friendica
1d157fc747 make it difficult to setup a private forum with no privacy 2012-05-17 23:05:41 -07:00
friendica
7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
friendica
3c0cf72716 make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it 
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
 2012-04-30 19:01:41 -07:00
tommy tomson
77a0570162 add link "remove account" to /mod/settings.php 2012-04-26 17:21:27 +02:00
friendica
00cb7f9efb don't allow non-existent themes as choices 2012-04-22 16:24:29 -07:00
friendica
972c01edb3 profile change activities 2012-04-12 21:10:32 -07:00
friendica
32cd62ff0a allow setting default new friend notify 2012-04-12 18:15:46 -07:00
Fabio Comuni
18ecac4e93 settings: remove call to profile_load() 2012-04-12 08:42:00 +02:00
Fabio Comuni
e992e29685 settings: move tabs to aside. add a new template "generic_links_widget.tpl" 2012-04-12 08:38:55 +02:00
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
 2012-04-05 13:39:15 +02:00
friendica
8e928d101b display settings hooks 2012-04-03 22:01:52 -07:00
friendica
5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
friendica
b4b1055b50 settings for unknown private mail acceptance 2012-03-31 00:57:59 -07:00
Fabio Comuni
054d21a2e8 settings: add "display settings" tab, with UI-related settings. 
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
 2012-03-30 15:45:02 +02:00
friendica
4fe0b56d76 bug #349 - email notls setting 2012-03-28 14:54:00 -07:00
Fabio Comuni
82cc86a41a user settings: don't show emoticons 2012-03-23 12:07:22 +01:00
friendica
139a86dbd3 some openid fixes, use identity url from openid server and normalise it. 2012-03-19 06:48:11 -07:00
friendica
82f2bfea5b convert boolean or int settings to strings to work around issues with template processing 2012-03-16 16:05:16 -07:00
friendica
110e8f2919 basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
friendica
7e270b043c addon settings form error 2012-03-13 23:52:13 -07:00
Tobias Hößl
59766b944c Some security against XSRF-attacks 2012-03-12 20:17:37 +00:00
Michael Johnston
fd1f8fb436 allow user to set number of items to show on network page 2012-03-09 21:29:39 -05:00
friendica
53412dacd4 update globaldir when page-type changes, add spam date field 2012-02-27 23:27:16 -08:00
Michael
fe3dfbee56 Mail: New options for actions after importing mails. 2012-02-26 23:39:29 +01:00
friendica
44c23cda8e theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -08:00
Fabio Comuni
73bee08ac2 enable ajax calendar with $a->config['experimentals']['new_calendar']=1 2012-02-15 12:47:50 +01:00
friendica
ffe7d8b1e9 item tag notifications 2012-02-09 21:18:50 -08:00
friendica
c76b224d8a prune old expired and deleted items 2012-01-30 15:13:24 -08:00
friendica
167ab537b5 backend for delegating forums 2012-01-26 16:52:12 -08:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00