Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 05:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
16959 commits 3 branches 64 tags 246 MiB
Commit graph

369 commits

Author SHA1 Message Date
Roland Haeder
a0e5f7a59a
added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please 
note that PHP5 allows 'array' as type-hint already (+ interface/class name).

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:05:50 +02:00
Roland Haeder
03571f6e74
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-04 19:46:56 +02:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Häder
fbd559a823
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:24 +01:00
Roland Häder
ed0d858f98
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:24 +01:00
Roland Häder
951006dd10
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:51:54 +01:00
Roland Häder
41a36606c6
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:50:19 +01:00
Hypolite Petovan
67ae0fed7f Fix response "self" assigment 
- Switch from unreliable `uid` matching to `author-id` using
public_contact()
 2017-03-06 05:07:17 -05:00
Hypolite Petovan
9d5384f107 - Remove tinyMCE mentions or convert to addeditortext() 
- Remove $editselect template value
 2017-01-26 22:50:27 -05:00
Hypolite Petovan
87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Roland Haeder
6c0c9d542a
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- 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:16:49 +01:00
Roland Häder
fc9dbc0899 added spaces + curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:38:28 +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
a905522eb5 Cleanup for #3010 - added spaces, thanks to @annando . 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 09:42:36 +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
Tobias Diekershoff
1fc35d5f44 Merge pull request #2979 from annando/issue-2772 
Issue 2772: Pending contacts should now be displayed
 2016-12-01 08:51:04 +01:00
Michael
63389ba23d Pending or blocked - that's the question ... 2016-11-30 04:30:48 +00:00
Michael
624fabf884 Somehow the changes of pull request 2748 got vanished 2016-11-29 20:25:27 +00:00
Michael
3a76a6766f Issue 2772: Pending contacts should now be displayed 2016-11-28 22:11:13 +00:00
Hypolite Petovan
4937a3b7d8 Add the self property to conversation responses 
- Add a condition to check if the current user is amongst the responses
- Populate the responses array with the self attribute
 2016-11-22 18:35:19 +01:00
Michael
3de862712d Issue 2772: Posts from pending contacts should be displayed as well. 2016-11-20 16:52:57 +00:00
Hypolite Petovan
4b0e76f3b7 Fix Issue #2803 - Hovercard view profile link and public directory link 
- Change "Edit Contact" link to "View Contact" in `include/Contact.php`
and `include/conversation.php`
- Add zrl parameter to public directory on single user instances
- Improved formatting of modified functions
 2016-10-22 22:49:12 -04:00
Tobias Diekershoff
252f1827c1 correction of typos 2016-09-24 08:08:04 +02:00
Michael Vogel
1cb6043aea Attachments are now displayed again. 2016-09-04 18:06:07 +02:00
Michael Vogel
c02b1c3f36 The "tagged with" message now works again. 2016-09-03 12:48:51 +02:00
rabuzarus
c1555b623a best_link_url: don't use redirect for pending contacts 2016-08-26 15:47:45 +02:00
Michael Vogel
0a46a3d10e Bugfix: Avatar pictures of mail contacts weren't displayed correctly 2016-07-11 20:42:18 +02:00
rabuzarus
073f520cee add missing strings for frio 2016-06-25 12:21:13 +02:00
Michael Vogel
0adff6f6b8 Fix for author-thumb/owner-thumb - DFRN: Relocate stuff 2016-06-19 20:01:25 +02:00
Michael Vogel
91db7a549c Optimised the amount of function for the item query 2016-06-19 08:32:38 +02:00
Michael Vogel
e512a83ecc Massively updated avatar handling 2016-06-19 01:07:20 +02:00
Michael Vogel
7f5a2d5c23 Categories were missing 2016-06-14 09:50:17 +02:00
Michael Vogel
2815173a52 Bugfix: Items weren't sorted correctly 2016-06-13 22:20:09 +02:00
Michael Vogel
125d80292b Some cleanup 2016-06-12 23:06:48 +02:00
Michael Vogel
c05898c57d The queries for items are unified (a little bit) 2016-06-12 21:04:55 +02:00
Michael Vogel
3e7e866e13 Baseurl removed 2016-06-05 21:22:14 +02:00
Michael Vogel
ea3a6ec6eb Some more cleanup and code removal. 2016-06-05 20:01:38 +02:00
Michael Vogel
71d3274841 Unified contact data handling 2016-06-05 13:57:11 +02:00
Michael Vogel
4a388e84af Frio: Adopt changes to search_item.tpl as well. 2016-05-28 13:08:43 +02:00
Michael Vogel
7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
Michael Vogel
c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel
092c2e5433 Removed some test code 2016-01-15 23:32:13 +01:00
Michael Vogel
90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
Michael Vogel
c4ba035ee3 Add some analysing stuff, rendered value is written now more often 2016-01-14 21:56:37 +01:00
fabrixxm
5758302f21 small doxigen comment fix 2016-01-02 12:53:42 +01:00
Michael Vogel
143e1a4a83 Bugfix: Warning because of undefined constant 2015-12-13 09:43:47 +01:00
Michael Vogel
42d903dd68 Redesign of the contact pages, new tab for contact statuses 2015-11-29 23:22:05 +01:00
Michael Vogel
37f466d16e Prevention of endless loops in the conversation 2015-11-18 23:57:53 +01:00
rabuzarus
642f3fca1a fix translation bug for likers 2015-10-14 19:48:57 +02:00
rabuzarus
5c2923869a this got lost by merge 2015-10-11 20:00:54 +02:00
rabuzarus
649578ae33 Merge develop-new into event-attendance-new 
Conflicts:
	include/conversation.php
 2015-10-11 19:39:55 +02:00
Michael Vogel
48309a25ec Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu 
Conflicts:
	include/conversation.php
 2015-10-11 05:11:46 +02:00
Tobias Diekershoff
27fa20ab22 Merge pull request #1947 from annando/1510-diaspora-follower 
Reworked contact relations between Diaspora and Friendica
 2015-10-10 18:50:20 +02:00
Michael Vogel
bb0dff2c75 Improved contact menu 2015-10-10 16:23:20 +02:00
Michael Vogel
efbdb57f92 Reworked contact relations between Friendica and Diaspora 2015-10-10 11:06:18 +02:00
rabuzarus
0eae67ea48 update attendance state on profile wall 2015-10-09 14:20:01 +02:00
Michael Vogel
16da708e07 Contact names with ">" and "<" are a problem ... 2015-10-09 07:39:38 +02:00
rabuzarus
ba1207e6e1 translate attendance with localize_item() 2015-10-08 22:23:09 +02:00
Michael Vogel
61c3ce7a21 Bugfix: The contact names had to be escaped 2015-10-08 00:25:55 +02:00
Michael Vogel
1f0b759e2f Added resize possibility to proxy function 2015-10-07 08:25:10 +02:00
Michael Vogel
a663e4693f Further improvement of the contact menu 2015-10-04 23:41:13 +02:00
Michael Vogel
b037f977fa The contact menu is now improved (for example a "Follow" link) 2015-10-04 21:17:28 +02:00
rabuzarus
7cb4ea52fd port of the event attendance feature of red matrix with example implementation for vier theme. 2015-09-30 16:58:02 +02:00
rabuzarus
2ff67ef5ed fixes like/dislike for photos 2015-09-30 14:39:00 +02:00
rabuzarus
f5c7006f30 rest of the consensus porting work and integration into friendica 
Credits to Mike Macgirvin for the code
 2015-09-30 14:38:13 +02:00
rabuzarus
0077494396 make event confirmation work 2015-09-30 14:35:17 +02:00
rabuzarus
37fccee503 first work for consensus 2015-09-30 14:34:10 +02:00
Michael Vogel
ccaeb00973 Better link descriptions. 2015-08-08 22:30:43 +02:00
Michael Vogel
b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
Michael Vogel
836432bb9a Removed Google Maps 2015-06-30 07:42:59 +02:00
rabuzarus
729b7f0e72 restore jotplugins 2015-06-27 15:11:18 +02:00
rabuzarus
5ce125d6e0 cleanup of some unused code 2015-06-26 15:13:52 +02:00
rabuzarus
37501a883e make notes work 2015-06-25 22:57:26 +02:00
Michael Vogel
0e895e24f7 Code reworks: replaced hardcoded network text with the corresponding constants. 2015-04-11 22:14:56 +02:00
Fabrixxm
5d19b21298 fix translation of poke activity body 2015-02-09 11:54:50 +01:00
Michael Vogel
58d814b793 issue 1283 - Share-it button support for friendica 2015-01-25 00:10:58 +01:00
Michael Vogel
d4b2d3bf8a Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings. 2014-08-13 00:13:13 +02:00
Michael Vogel
f68bbffb64 Adding preview value to "prepare_body" hook. (Will be used in addons for network related previews) 2014-07-09 20:44:12 +02:00
Michael Vogel
acf1c3956c Only show connectors when not "hide wall" is enabled. 2014-05-10 00:24:15 +02:00
Michael Vogel
01971428aa target="_blank" instead of target="external-link" 2014-02-11 23:42:06 +01:00
Michael Vogel
aed28a24f1 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/crepair.php
 2014-01-05 16:22:42 +01:00
Michael Vogel
d5ae5ecedd - Improved speed due to forced indexes when showing items. 
- Possibility to setup a hostname
 2013-09-15 10:40:58 +02:00
friendica
1d358fe6de system support for complete blocking 2013-04-28 21:02:53 -07:00
Michael Vogel
93143702ed Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
 2013-02-17 12:35:40 +01:00
zottel
c0af9b2938 Reset network when showing a contact's posts 
There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
 2013-02-01 09:12:37 +01:00
Michael Vogel
2cb576d305 Bugfixing after adding timestamps 2013-01-27 13:57:44 +01:00
Zach Prezkuta
488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
Tobias Diekershoff
1f36ebdb2b add display_item hook back around l. 686 to the conversation 2013-01-22 08:11:13 +01:00
Michael Vogel
4e3d0018c6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	include/items.php
	update.php
 2013-01-20 14:07:57 +01:00
Michael Vogel
82c00660e0 Preloading of items in the cache when receiving them. 2013-01-17 23:20:40 +01:00
Michael Vogel
5501dd0759 Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds. 2013-01-13 17:13:01 +01:00
Zach Prezkuta
74caf1a4a7 * Add MIME types for file attachments 
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
 2013-01-12 06:31:32 -07:00
Zach Prezkuta
e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
Zach Prezkuta
263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
Zach Prezkuta
53a4cf5339 only use Smarty if the view/smarty3/ directory is writable; location bug fix 2012-12-23 06:16:35 -07:00
Zach Prezkuta
96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Zach Prezkuta
94204d9160 implement features 2012-11-22 09:14:22 -07:00
Zach Prezkuta
999c3439e6 fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
Zach Prezkuta
c9248b66db display live update; don't collapse comments on live update 2012-11-01 18:31:50 -06:00
Zach Prezkuta
6effdd570c add a confirm dialog and a busy rotator for delete selected 2012-11-01 17:42:40 -06:00