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

269 commits

Author SHA1 Message Date
Roland Haeder
6e44acfed6
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:15:53 +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
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 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
e4c6cfd2d8 Moves the function "is_result" from dba to dbm. 2016-07-02 14:00:42 +02:00
Michael Vogel
7d531afd00 Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced 
Conflicts:
	boot.php
 2016-07-02 13:38:23 +02:00
Michael Vogel
807fbe173b Some more places where the avatar picture is taken from the database 2016-06-10 07:44:32 +02:00
Michael Vogel
71d3274841 Unified contact data handling 2016-06-05 13:57:11 +02:00
Michael Vogel
0a617da044 Wall message can now redirect to your own page if you are connected. 2016-05-29 21:29:26 +02:00
Michael Vogel
77f7619720 Issue 1769: Some enhancements for sending wall mails 2016-05-29 19:35:23 +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
1021111241
Bugfix: Messages work now again 2016-05-01 13:48:52 +02:00
Michael Vogel
8e0b3b28da Bugfix: The message list always showed "x and you" 2016-04-30 14:13:43 +02:00
Michael Vogel
0f24f2d9ae Bugfix: Messages work now again 2016-04-17 22:07:01 +02:00
Roland Haeder
9cfc249b12
Moved is_filled_array() to both dba classes and named it is_result(). 
Please see ticket #2390 for full discussion.

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-12 18:54:55 +01:00
Roland Haeder
4ec377008d Introduced is_filled_array() + added some missing array initialization 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:31:49 +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
Michael Vogel
2f13506180 Bugfix: The participants on the mail page were displayed wrong 2015-12-28 18:13:03 +01:00
FlxAlbroscheit
613cf41fd6 Preview last five conversations in message-sidebar 2015-11-08 15:45:42 +01:00
FlxAlbroscheit
14dff6b0e0 Preview last five conversations in message-sidebar 2015-11-07 18:53:32 +01:00
Michael Vogel
b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
Michael Vogel
848c09935a The contact list in mails now contains not only the name but also the address. 2015-01-27 08:04:24 +01:00
Zach Prezkuta
488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
Zach Prezkuta
609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
Zach Prezkuta
263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -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
Zach Prezkuta
94204d9160 implement features 2012-11-22 09:14:22 -07:00
Tobias Diekershoff
647802f92e get "ago" information into the mail thread view 2012-08-27 19:46:35 +02:00
Tobias Diekershoff
1e9d35fb0e pass "ago" information to the mail_list template 2012-08-27 19:31:41 +02: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
Zach Prezkuta
da2ccebed8 fix bugs 2012-07-07 18:50:33 -06:00
Zach Prezkuta
173b3a1b9a allow more than one embedded private photo 2012-07-07 16:24:20 -06:00
friendica
e2a725ff98 pagination start off by one 2012-07-01 19:17:21 -07:00
friendica
777830745f missing $submit 2012-06-19 00:50:24 -07:00
friendica
6c3ab225f7 set minchars to 2 for PM lookups too 2012-06-05 20:49:56 -07:00
Tobias Diekershoff
6fbeafc843 prv messages: make submit translateable 2012-06-03 17:16:29 +02:00
friendica
8a5dcf64d8 fix PM replies after autocomplete changes 2012-05-10 20:01:13 -07:00
friendica
547007e199 add photos to PM autocomplete, improved appearance 2012-05-10 19:29:01 -07:00
friendica
774c51cc19 email autocomplete 2012-05-10 01:45:51 -07:00
friendica
c141909f33 wrap private message autocomplete in an ifdef to make it easier to test/develop 2012-05-08 01:14:24 -07:00
friendica
8c26640835 reset permissions to forum default when adding forum delivery chain 2012-05-06 23:06:21 -07:00
friendica
b74a776162 I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off. 2012-05-06 20:06:39 -07:00
friendica
851264161f mail autcomplete testing 2012-05-06 19:55:39 -07:00
friendica
49ccefd6c7 bad sql left after the mailbox in/out merge 2012-05-05 17:53:23 -07:00
friendica
c9e5609cbf bug #307, explaining decentralised private photos is impossible. 2012-04-25 05:41:32 -07:00
friendica
18e225b051 move all fix_mce to one function so it can easily be undone 2012-04-10 17:14:07 -07: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
5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
friendica
ea10bba147 fix "between yourself and You" in mail list 2012-03-31 20:08:32 -07:00
Fabio Comuni
50711040cb message: remove tabs, move new message link to aside, all message with gmail-style 2012-03-28 15:31:58 +02:00
friendica
b5d0315d55 preparation for some possibly killer features 2012-03-26 17:57:27 -07:00
Tobias Hößl
75823c2353 Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button 2012-03-16 17:45:07 +00:00
friendica
110e8f2919 basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
friendica
de017d1ed7 sort inbox by recently replied conversations first 2012-03-13 19:27:52 -07:00
Tobias Hößl
4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
friendica
d9c5d9d2eb default the text template var on conversations 2012-03-10 15:53:36 -08:00
friendica
1bddd48661 bug #327 - composed private message is lost if no recip specified. 2012-03-10 15:50:51 -08:00
Tobias Hößl
635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica
3878b58f0d bug #324 - tinymce used for mail even if editplain being used. 2012-03-09 00:47:10 -08:00
Tobias Hößl
f48556cbc0 contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used 2012-02-28 13:40:41 +00: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
friendica
d100944fe6 api post default to default post permissions was broken 2011-12-07 14:04:34 -08:00
friendica
7eba8adbf7 pm replies 2011-12-06 19:15:42 -08:00
friendica
116e20c89d add conv structure 2011-12-05 00:35:44 -08:00
friendica
37730ecc2a typo 2011-11-30 17:08:16 -08:00
friendica
8f381e01ae html_entity_decode D* incoming text 2011-11-30 03:22:01 -08:00
friendica
7474c48022 add tag to personal 2011-11-29 19:52:14 -08:00
Friendika
df7702709b common tabs to notifications and mail 2011-10-11 21:30:23 -07:00
Devlon Duthie
da53ebf4b3 added activetab var to message.php for templates 
(testbubble only) added logic to photo header to make tab 'sticky' (active class for styling)
(testbubble only) css fix for avatars in wallitems
 2011-10-02 20:37:47 -05:00
Fabio Comuni
5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Friendika
63277b57fc template escapes 2011-09-19 19:46:18 -07:00
fabrixxm
d8bd4fbb3e Merge branch 'master' into newui 2011-08-22 13:56:08 +02:00
fabrixxm
43040faf22 move send private message code out of view code 2011-08-19 16:54:41 +02:00
fabrixxm
07b6c868b3 remove javascript to set selectect nav item. enanche img template prefetch ignoring 2011-08-17 18:36:24 +02:00
Fabio Comuni
e6444adafd change nav selected css class 2011-07-25 16:52:30 +02:00
Friendika
e2f1540f25 events, continued. Also better regex matching accounting for empty elements 2011-06-07 22:13:07 -07:00
Fabio Comuni
e1107b55c6 add info() function. Works like notice() but show messages in a div with class info-message. 
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
 2011-05-23 11:39:57 +02:00
Friendika
b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika
a00813497f bring back load_view_file for dispy templates 2011-05-10 23:35:31 -07:00
Friendika
c052d68828 don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. 2011-05-10 16:12:50 -07:00
Fabio Comuni
92156cd840 Merge remote-tracking branch 'friendika-master/master' into iconpopup 2011-04-04 09:31:12 +02:00
Friendika
d728961cbf translateable time formats (PM & birthdays) 2011-03-31 14:46:16 -07:00
Fabio Comuni
29878d9c26 url \"/message/new/<id>\" preselect contact <id> in \"To\" select box 2011-03-31 16:54:06 +02:00
Friendika
798c83b6aa localise some more templates 2011-03-21 00:21:35 -07:00
Friendika
71d4810697 photo in mail message getting bogus response 2011-03-03 20:58:39 -08:00
Friendika
755c2245e8 move php path setting inside proc_run 2011-02-23 15:16:12 -08:00
Friendika
d6998ffef2 small fixes 2011-02-16 13:19:54 -08:00
Friendika
acce5c95a3 set contact permissions on photos uploaded to private messages 2011-02-16 03:14:45 -08:00
fabrixxm
e9251499dd Added proc_run() and modified all occurrence of proc_close(proc_open()) to use proc_run() 2011-01-24 22:00:02 +01:00
Friendika
3811923c14 put birthday reminders on default network page, add smileys to private mail 2011-01-16 16:40:09 -08:00
Friendika
184f8e143e use local photo in email, email photo upload point to new url 2010-12-05 19:28:47 -08:00
Friendika
9be4b3482e drop mail delivered flag now that queue is implemented 2010-11-23 16:08:48 -08:00
Friendika
8c395f96de view directory cleanup 2010-11-15 21:02:59 -08:00
Friendika
d825db3649 lint 2010-11-07 15:46:49 -08:00
Friendika
4cba826a2f hub anomolies & swat0 compliance 2010-11-04 20:47:44 -07:00
Mike Macgirvin
f0b6400584 more lint 2010-10-31 16:38:22 -07:00
Mike Macgirvin
cbaf0f2dc9 another typo 2010-10-30 01:16:51 -07:00
Mike Macgirvin
2fc4677173 messages need subjects to link to 2010-10-29 23:00:10 -07:00
Mike Macgirvin
9f0cedad8e remove debugging statement 2010-10-06 16:00:19 -07:00
Mike Macgirvin
01d36785b0 fixed photo comments, msg typo, and changed cursor when hovering 
over "special friends" where SSO is allowed
 2010-09-27 19:48:45 -07:00
Mike Macgirvin
34eedb503a stronger type checking on comparisons 2010-09-26 17:24:20 -07:00
Mike Macgirvin
b91494d22e preliminary network abstraction, configurable debugging. 2010-09-26 16:30:21 -07:00
Mike Macgirvin
d5a13b1e4c localisation path for all view templates 2010-09-22 18:00:19 -07:00
Mike Macgirvin
db89a1eb44 prepare for open source server release 2010-09-21 16:01:19 -07:00
Mike Macgirvin
65a420b227 theme cleanup 2010-09-18 21:11:18 -07:00
Mike Macgirvin
ffb1997902 mistpark 2.0 infrasturcture lands 2010-09-08 20:14:17 -07:00
Mike Macgirvin
facca43e2d no more url in cmdline 2010-08-16 20:47:40 -07:00
Mike Macgirvin
35e29e10e6 installer changes, pe sync 2010-08-15 21:49:29 -07:00
Mike Macgirvin
04e65823d7 more post branch bug fixes 2010-08-10 05:58:22 -07:00
Mike Macgirvin
aea121ea2a message fixes 2010-07-30 22:27:41 -07:00
Mike Macgirvin
56fc81f57e mail more or less working 2010-07-30 21:22:52 -07:00
Mike Macgirvin
b399b20dee mail, i18n, etc. 2010-07-30 06:09:20 -07:00
Mike Macgirvin
da766f1159 starting on email 2010-07-28 04:45:07 -07:00