6679734135
Merge branch 'master' into tres
...
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
2015-04-23 19:49:41 -07:00
c696860cc5
webpages blocks fixes
2015-04-23 21:04:01 +02:00
29061b3ee3
do not show acl button if not owner
2015-04-22 12:31:30 +02:00
dfc88a41df
fix webpages profile_tabs
2015-04-22 12:21:33 +02:00
9e490d022b
fix webpage perms
2015-04-22 12:00:15 +02:00
b4dff3a9ff
provide headings for blocks and layouts
2015-04-22 10:31:36 +02:00
e58e8f3f75
bring lockstate to webpages
2015-04-21 23:08:54 +02:00
21704ecb93
bring lockview to menu items, slightly change the way /lockview is called
2015-04-21 22:45:54 +02:00
0bd9fe0b11
rework and hopefully improve webpage menu creation workflow
2015-04-21 10:05:26 +02:00
53339d19a3
issue #176 , sender copy of item not obscured if using private mention
2015-04-20 20:14:07 -07:00
a707e9b9f5
issue #178 , searching for words such as 'data' would return private items regardless of their unobscured content.
2015-04-19 23:16:17 -07:00
9cc8b44579
issue #157 , provide default directory sort order
2015-04-19 23:04:14 -07:00
dadcfd3ff6
switch from IMG_XXX constants to IMAGETYPE_XXX constants
2015-04-19 18:06:42 -04:00
0883512e30
log this since we may need it to track down failures
2015-04-18 17:40:44 -07:00
61e4ee753d
allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes
2015-04-17 11:20:22 +02:00
10cc643f65
wording and css fixes
2015-04-16 23:46:12 +02:00
9addc4581e
provide a separate input field for rpost attachments
2015-04-16 23:26:11 +02:00
90d3a6c02d
make rpost respect default post permissions
2015-04-16 11:15:04 +02:00
b42bb09635
whitespace
2015-04-16 10:46:59 +02:00
86ac9c0d6b
move share webpage element from editwebpage to webpages and make it shareable with rpost
2015-04-16 10:43:14 +02:00
a597c74b97
Update viewsrc.php
...
Adding the item ID to the item source view
2015-04-15 12:26:03 +02:00
2c8394a4b9
funny I should mention comanche preview (yesterday) as clicking the view link on a layout does nothing interesting at all. So I've made it do a crude but useable preview with page content of 'Lorem Ipsum'.
2015-04-14 21:48:42 -07:00
89536ff88b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-14 16:22:59 -07:00
3a45206b99
default perms not being set in some cases
2015-04-14 16:22:33 -07:00
953819e7da
css fixes and remove expert mode for block page content type
2015-04-14 12:52:31 +02:00
79b5fb5b58
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-04-14 11:50:34 +02:00
bf2a97147e
some more on webpages
2015-04-14 11:50:21 +02:00
213ca7f8b5
unquote binary
2015-04-13 16:18:11 -07:00
d3bc721138
item_check_service_class wasn't returning correct results
2015-04-13 16:03:09 -07:00
865b602cf8
webpages appearence
2015-04-13 23:38:36 +02:00
7c8b9397ae
reverse file activity logic
2015-04-12 13:13:22 +02:00
3fd2e4b716
program the affinity slider labels
2015-04-09 19:51:58 -07:00
2619b60721
make sure we redirect to a sane place after deleting a webpage element
2015-04-09 15:45:08 -07:00
7bec4b313a
system channel always has allow_code privileges
2015-04-08 23:05:36 -07:00
37afc81847
update features, allow sys account page deletion
2015-04-08 17:54:52 -07:00
dc2830755d
add common connection count to suggestions
2015-04-07 18:13:10 -07:00
558246257c
separate the hub query since it changes the logic default and cannot easily be grouped
2015-04-07 13:51:51 -07:00
5bc7c0e798
add endless scroll to viewconnections module
2015-04-06 22:36:46 -07:00
3a3563a4b1
commit 59828593c broke some important poco stuff, looks like the cat might have climbed over the keyboard and deleted something that wasn't intended to be deleted.
2015-04-06 19:00:13 -07:00
821bbd41e1
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-06 16:14:58 -07:00
04959a095f
make the findpeople widget honour the local/global directory setting
2015-04-06 16:14:12 -07:00
754ac2cff7
Fix Design Tool navigation for sys channel.
...
Fix creating menu for sys channel.
2015-04-06 23:52:13 +02:00
f1e73abd21
issue #226
2015-04-05 21:32:54 -07:00
649ada7100
provide ability to have randomised homepage content from a set of pages name home-*
2015-04-02 13:22:48 -07:00
d599ebe742
update resource links
2015-04-01 15:52:02 -07:00
6f78d7a85d
fix regdir
2015-03-31 21:06:48 -07:00
7f6ba91dfa
allow webpage for home to use its own layout file
2015-03-31 17:52:03 -07:00
cbaa2a9b84
don't included any deleted posts in the self query
2015-03-30 21:06:41 -07:00
d3c064cc34
title of preview button incorrect, fix ability to upload to webpages
2015-03-30 19:41:42 -07:00
d0361582b0
Correcting reported Doxygen syntax warnings.
...
Fixed wrong Doxygen syntax and add some of the available FIXME to
Doxygen documentation.
Updated Doxygen configuration to add also all capital letter tags.
Adding some more Doxygen documentation.
2015-03-29 22:23:00 +02:00
friendica
Mario Vavti
friendica
Michael Johnston
mrjive
Habeas Codice
Klaus Weidenbach