cc16369b6f
Merge pull request #3033 from annando/1612-object-type
...
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 15:44:07 +01:00
6e46987515
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 07:10:47 +00: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
63610c7b73
Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/Photo.php
include/api.php
include/cache.php
include/dbstructure.php
include/enotify.php
include/items.php
include/onepoll.php
include/queue_fn.php
include/session.php
include/text.php
mod/contacts.php
mod/dfrn_request.php
mod/display.php
mod/events.php
mod/item.php
mod/message.php
mod/msearch.php
mod/photos.php
mod/poco.php
mod/profile.php
mod/proxy.php
mod/videos.php
update.php
view/theme/diabook/theme.php
view/theme/vier/theme.php
2016-12-13 11:00:44 +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
rabuzarus
9878974e1f
fix photos page permissions
2016-11-14 18:49:51 +01:00
rabuzarus
5459b00499
cache: serialize the cache content directly in the cache class
2016-11-04 16:44:49 +01:00
Michael Vogel
8cab3b5592
More transactions, more queries on uncommitted data
2016-10-24 08:10:27 +00:00
Michael Vogel
ee5ada6991
We now use memcache if configured and installed.
2016-10-23 21:59:40 +00:00
Michael Vogel
b429b85680
CSR changes, split dbclean in separate processes if worker is active
2016-10-22 10:14:41 +00:00
Michael Vogel
501c45def5
Some more improved queries
2016-10-21 18:25:21 +00:00
Michael Vogel
60a0235af0
The account type is now read and displayed
2016-10-01 20:03:27 +00:00
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
rabuzarus
3921113e5c
photos - include paginate into the templates - provide a photo_album.tpl for frio
2016-08-04 21:53:22 +02:00
Michael Vogel
668da905e2
"proc_run" is now called with priority.
2016-08-01 07:48:43 +02:00
Michael Vogel
f27bc00464
Remove obsolote functions
2016-07-09 20:09:09 +02:00
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
5a90f865ed
Add the guid to items that we create locally
2016-05-01 13:47:24 +02:00
Michael Vogel
8f00836ffb
Add the guid to items that we create locally
2016-03-20 15:01:50 +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
fabrixxm
fcf7a791f1
Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget"
...
This reverts commit 83e54f70d3ecf576bdd0
2016-01-04 11:46:19 +01:00
rabuzarus
29c671bb22
photos aside widget:permissions cleanup
2016-01-03 16:09:05 +01:00
rabuzarus
20fbf670db
photo aside widget for profile page
2015-12-30 00:26:50 +01:00
rabuzarus
e61d6e030e
fix account_type
2015-12-14 14:12:56 +01:00
rabuzarus
d963cdfe48
photos-albms widget: add some classes
2015-12-02 20:01:22 +01:00
rabuzarus
cd7ec72b20
unify hcard and vcard: make $pdesc available in hcard&vcard
2015-12-01 19:47:23 +01:00
rabuzarus
89c5989cfb
unify hcard and vcard
2015-12-01 18:31:08 +01:00
rabuzarus
649578ae33
Merge develop-new into event-attendance-new
...
Conflicts:
include/conversation.php
2015-10-11 19:39:55 +02:00
rabuzarus
c775d6885b
port of reds geotag feature
2015-10-03 20:24:35 +02:00
Michael Vogel
68a6f0298e
The events moved from the profile to the navigation bar - for supported themes
2015-09-30 18:50:44 +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
3d7602a5a3
don't show profile photos in albums to others than the owner or remote user
2015-09-29 19:44:26 +02:00
fabrixxm
5a23bd400c
Merge pull request #1715 from rabuzarus/theme_uid
...
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
fabrixxm
28f0e9a2de
Merge pull request #1696 from rabuzarus/acl-var
...
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
rabuzarus
a982320ba9
show maximagesize warning in a human readable format
2015-06-29 02:39:08 +02:00
rabuzarus
8cca849c2e
Merge acl-var into develop
...
Conflicts:
mod/settings.php
2015-06-27 15:23:19 +02:00
rabuzarus
373bb0822b
get the themes settings of foreign profiles
2015-06-27 14:10:43 +02:00
rabuzarus
5ce125d6e0
cleanup of some unused code
2015-06-26 15:13:52 +02:00
rabuzarus
94b21245bc
some more work to get acl data into populate_acl
2015-06-25 18:57:42 +02:00
rabuzarus
bfebf9636b
acl for events and photos
2015-06-25 12:38:09 +02:00
fabrixxm
35e9fc3b02
use fields template in photo edit form
2015-06-22 20:07:19 +02:00
rabuzarus
a674e782b2
fix Issue #1638
2015-06-01 01:36:37 +02:00
rabuzarus
b61e39a1cb
cleaning after local merge
2015-05-29 16:30:42 +02:00
rabuzarus
553a152345
Merge photo-template into develop
2015-05-29 16:24:58 +02:00
rabuzarus
a7d417abb2
remove whitespace
2015-05-29 16:18:30 +02:00
rabuzarus
5cbb5b140c
css work
2015-05-29 16:08:17 +02:00
rabuzarus
415a606a59
better solution to exclude Contact Photos and include count of Photos
2015-05-28 15:54:53 +02:00
