 friendica
|
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 |
|
 Mario Vavti
|
c696860cc5
|
webpages blocks fixes
|
2015-04-23 21:04:01 +02:00 |
|
 friendica
|
4759fa662b
|
explain a bit more about the structure and scope
|
2015-04-22 16:56:42 -07:00 |
|
|
Mario Vavti
|
29061b3ee3
|
do not show acl button if not owner
|
2015-04-22 12:31:30 +02:00 |
|
|
Mario Vavti
|
dfc88a41df
|
fix webpages profile_tabs
|
2015-04-22 12:21:33 +02:00 |
|
|
Mario Vavti
|
9e490d022b
|
fix webpage perms
|
2015-04-22 12:00:15 +02:00 |
|
|
Mario Vavti
|
b4dff3a9ff
|
provide headings for blocks and layouts
|
2015-04-22 10:31:36 +02:00 |
|
|
friendica
|
e807231e91
|
add translation plugin to the to-do
|
2015-04-21 22:22:28 -07:00 |
|
|
friendica
|
2cef6c3ac5
|
use PERMS_SPECIFIC for anything that hasn't been specified. This way there's nothing that's "only yourself", and let's you add additional permissions at will rather than be forced to accept the defaults or turn on custom permissions just to give a friend delegation rights or the ability to post photos.
|
2015-04-21 21:41:39 -07:00 |
|
|
Mario Vavti
|
09096811ca
|
missing class
|
2015-04-21 23:30:12 +02:00 |
|
|
Mario Vavti
|
ba524e1a72
|
move .lockview to style.css and a typo
|
2015-04-21 23:27:30 +02:00 |
|
|
Mario Vavti
|
c52682c68f
|
missing dropdown class
|
2015-04-21 23:21:09 +02:00 |
|
|
Mario Vavti
|
e58e8f3f75
|
bring lockstate to webpages
|
2015-04-21 23:08:54 +02:00 |
|
|
Mario Vavti
|
21704ecb93
|
bring lockview to menu items, slightly change the way /lockview is called
|
2015-04-21 22:45:54 +02:00 |
|
|
Mario Vavti
|
0bd9fe0b11
|
rework and hopefully improve webpage menu creation workflow
|
2015-04-21 10:05:26 +02:00 |
|
|
friendica
|
6bc2766d79
|
issue #162
|
2015-04-20 20:49:55 -07:00 |
|
|
friendica
|
53339d19a3
|
issue #176, sender copy of item not obscured if using private mention
|
2015-04-20 20:14:07 -07:00 |
|
|
friendica
|
3eeea9d8f0
|
force event obj_type on update
|
2015-04-20 17:02:45 -07:00 |
|
|
friendica
|
8c54ad4f3a
|
update to-do list
|
2015-04-20 01:55:23 -07:00 |
|
|
friendica
|
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 |
|
|
friendica
|
9cc8b44579
|
issue #157, provide default directory sort order
|
2015-04-19 23:04:14 -07:00 |
|
|
friendica
|
4383564777
|
doco updates
|
2015-04-19 21:39:45 -07:00 |
|
|
friendica
|
d5f4a19a77
|
add favorites/create and destroy to api
|
2015-04-19 20:37:24 -07:00 |
|
|
friendica
|
f315c55d32
|
api performance enhancer
|
2015-04-19 18:57:12 -07:00 |
|
|
friendica
|
185ce2da69
|
assorted fixes to api direct messages
|
2015-04-19 18:14:17 -07:00 |
|
|
friendica
|
8757789213
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-04-19 17:39:33 -07:00 |
|
|
friendica
|
6511d5ee2c
|
some api cleanup
|
2015-04-19 17:39:17 -07:00 |
|
|
redmatrix
|
cf34d5cf82
|
Merge pull request #315 from unary/wallattach
switch from IMG_XXX constants to IMAGETYPE_XXX constants
|
2015-04-20 08:50:35 +10:00 |
|
 Michael Johnston
|
dadcfd3ff6
|
switch from IMG_XXX constants to IMAGETYPE_XXX constants
|
2015-04-19 18:06:42 -04:00 |
|
|
friendica
|
82f2765f7b
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-04-19 13:41:38 -07:00 |
|
|
friendica
|
01efda6850
|
api - unobscure mail
|
2015-04-19 13:41:12 -07:00 |
|
|
Mario Vavti
|
71117628bc
|
attach an id to menues, allow $menu_title to be empty, if no custom menu class is provided use default redbasic classes
|
2015-04-19 15:22:50 +02:00 |
|
|
Mario Vavti
|
dd5b97639e
|
Introduce wrap variable in comanche blocks (if set to none the block will not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo
|
2015-04-19 13:25:05 +02:00 |
|
|
friendica
|
0883512e30
|
log this since we may need it to track down failures
|
2015-04-18 17:40:44 -07:00 |
|
|
Mario Vavti
|
11b7fedd29
|
css fix
|
2015-04-18 16:23:14 +02:00 |
|
|
Mario Vavti
|
3ee78398aa
|
fix page-title margin
|
2015-04-18 13:32:40 +02:00 |
|
|
friendica
|
0ce8572fef
|
remove failed experiment
|
2015-04-17 23:04:58 -07:00 |
|
|
friendica
|
e1b9053563
|
add last post to api/account/verify_credentials
|
2015-04-17 20:22:10 -07:00 |
|
|
friendica
|
9f35971860
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-04-17 17:21:10 -07:00 |
|
|
friendica
|
3d99a6b5c4
|
hide event share button when editing an event
|
2015-04-17 17:20:24 -07:00 |
|
|
Mario Vavti
|
c02ff823f6
|
adjus webpage font size to match conv item font size
|
2015-04-17 13:53:09 +02:00 |
|
|
Mario Vavti
|
e465a32168
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-04-17 11:20:43 +02:00 |
|
|
Mario Vavti
|
61e4ee753d
|
allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes
|
2015-04-17 11:20:22 +02:00 |
|
|
friendica
|
811cfc56d5
|
you need communications in there someplace.
|
2015-04-16 16:35:09 -07:00 |
|
|
friendica
|
507d04a987
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-04-16 15:41:43 -07:00 |
|
|
friendica
|
f09df06130
|
simplify
|
2015-04-16 15:41:27 -07:00 |
|
|
Mario Vavti
|
10cc643f65
|
wording and css fixes
|
2015-04-16 23:46:12 +02:00 |
|
|
Mario Vavti
|
9addc4581e
|
provide a separate input field for rpost attachments
|
2015-04-16 23:26:11 +02:00 |
|
|
Mario Vavti
|
90d3a6c02d
|
make rpost respect default post permissions
|
2015-04-16 11:15:04 +02:00 |
|
|
Mario Vavti
|
b42bb09635
|
whitespace
|
2015-04-16 10:46:59 +02:00 |
|