rabuzarus
5ab6843f38
Bugfix: fix typo in event variable
2017-01-20 13:24:53 +01:00
e67133ef56
Merge remote-tracking branch 'upstream/develop' into 1701-curl-range
...
Conflicts:
mod/oexchange.php
mod/uimport.php
2017-01-12 07:25:44 +00:00
Michael Vogel
5eaa5951a1
Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3
...
Normalize App parameter declaration (mod folder, 2 out of 3)
2017-01-11 22:49:01 +01:00
Michael Vogel
05a2989ecb
Merge pull request #3079 from Hypolite/issue/#3039-mod-3of3
...
Normalize App parameter declaration (mod folder, 3 out of 3)
2017-01-11 22:33:41 +01:00
Michael Vogel
df8b522f6b
Merge pull request #3077 from Hypolite/issue/#3039-mod-1of3
...
Normalize App parameter declaration (mod folder, 1 out of 3)
2017-01-10 17:28:21 +01:00
a2debaa68a
Download limit for fetching data via "z_fetch_url"
2017-01-09 23:10:32 +00:00
Hypolite Petovan
a7ce601580
Normalize App parameter declaration (mod folder, 3 out of 3)
2017-01-09 23:14:55 +11:00
Hypolite Petovan
f92918f471
Normalize App parameter declaration (mod folder, 2 out of 3)
2017-01-09 23:14:25 +11:00
Hypolite Petovan
8a197055e3
Normalize App parameter declaration (mod folder, 1 out of 3)
2017-01-09 23:12:54 +11:00
ed0143c9f0
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
2017-01-07 16:13:57 +00:00
c2543f918b
Last minutes changes
2017-01-07 13:52:30 +00:00
1b48799f08
Don't do queries if not needed
2017-01-07 11:28:18 +00:00
6976ad4892
Removed some removed indexes
2017-01-06 06:37:27 +00:00
42c2e09382
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-04 09:03:00 +01:00
db2d0e0095
removal of useless variable
2017-01-01 23:38:32 +00:00
79b5eb63db
Some more reverts
2017-01-01 23:37:29 +00:00
212f78386d
Deactivated the auto mention - we should do it differently.
2017-01-01 23:35:34 +00:00
8aaf09f9ee
Automatically add a Diaspora mention
2017-01-01 23:18:42 +00:00
8c579735f9
Diaspora: Add a mention when doing a thread reply
2017-01-01 21:21:16 +00:00
d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:49:08 +01:00
d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop
...
dbm::is_result() calls needed merge
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:33:41 +01:00
Michael Vogel
c348dd6134
Merge pull request #3046 from rabuzarus/2016125_-_photo_albums_refresh
...
Update the photo albums cache on upload, album deletion or renaming
2016-12-29 11:08:16 +01:00
236c7805a4
for the fed stats it is better to have a >= then a = in the query
2016-12-27 17:53:59 +01:00
rabuzarus
a6d7ad0755
Update cache on photo edit only when album name has changed
2016-12-26 02:41:00 +01:00
rabuzarus
08fb35838c
Update the photo albums cache on upload, album deletion or renaming
2016-12-25 16:58:38 +01:00
f844d96a7f
added some spaces
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 20:21:38 +01:00
b7c9d63b7a
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated.
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 20:09:10 +01:00
3dbb92c0dc
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 19:51:11 +01:00
89319d9579
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-23 19:51:09 +01:00
45dd1ccc7b
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-23 19:51:08 +01:00
c1b76e889e
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-23 19:51:06 +01:00
54905a3d81
added more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:51:02 +01:00
3472191b05
Changed $a->get_baseurl() to App::get_baseurl()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:51:00 +01:00
8ce20f975c
Changed $a->get_baseurl() to App::get_baseurl()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:50:58 +01:00
8b8a45b703
added curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:50:53 +01:00
9fad8109ff
changed to this:
...
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:50:21 +01:00
9b6ad2fc47
Coding convention:
...
- added curly braces
- added space between "if" and brace
- also added TODO (old-lost code?)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:49:39 +01:00
f8a213e23b
*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-23 19:49:36 +01:00
97c507e763
Coding convention applied:
...
- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:49:15 +01:00
31cd3fb33c
Coding convention continued:
...
- added curly braces
- added spaces between if/foreach and brace
- made code block look nicer (spaces added, tabs replaced by space)
- added TODO
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 17:13:34 +01:00
13b57d4d50
Coding convention continued:
...
- added curly braces
- added spaces between if/foreach and brace
- made code block look nicer (spaces added, tabs replaced by space)
- added TODO
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 17:12:34 +01:00
5547bc2cc2
Continued rewriting a bit:
...
- more usage of dbm::is_result()
- nicer look of code
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 17:03:00 +01:00
d82ed5d1b4
Continued with code convention:
...
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 15:31:23 +01:00
c9194b0381
Continued with code convention:
...
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 15:30:23 +01:00
20e71d21a6
Merge branch 'rewrites/app_get_baseurl_static' into develop
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/admin.php
mod/bookmarklet.php
mod/community.php
mod/contacts.php
mod/crepair.php
mod/editpost.php
mod/events.php
mod/install.php
mod/lostpass.php
mod/network.php
mod/notify.php
mod/suggest.php
mod/uexport.php
mod/videos.php
view/theme/duepuntozero/config.php
view/theme/frio/config.php
view/theme/quattro/config.php
view/theme/vier/config.php
2016-12-22 11:37:23 +01:00
ad20c5504d
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/diaspora.php
object/Item.php
2016-12-22 11:33:00 +01:00
c0df692f5f
Merge remote-tracking branch 'upstream/develop' into develop
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/diaspora.php
object/Item.php
2016-12-22 11:29:56 +01:00
Michael Vogel
9e689e8b9b
Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links
...
Diaspora: Complete /people/* links from fcontact or author domain
2016-12-22 10:17:44 +01:00
a314dbc562
removed conflict solving remains, took from upstream/develop
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:14:14 +01:00
8b7d5d0efc
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
2016-12-22 09:06:00 +01:00
