Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | second pass name change | redmatrix | 2015-05-05 | 2 | -3/+3 | |
| | | | | ||||||
| * | | | first pass name change | redmatrix | 2015-05-05 | 13 | -22/+22 | |
| | |/ | |/| | ||||||
| * | | remove obsolete linebreak | Mario Vavti | 2015-05-04 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-05-01 | 2 | -2/+28 | |
|\| | ||||||
| * | more performance work | friendica | 2015-04-30 | 1 | -1/+9 | |
| | | ||||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-30 | 1 | -0/+2 | |
| |\ | ||||||
| * | | just a test, please do not try to implement this as there are severe ↵ | friendica | 2015-04-30 | 2 | -2/+20 | |
| | | | | | | | | | | | | security issues | |||||
* | | | Merge branch 'master' into tres | friendica | 2015-04-29 | 5 | -13/+30 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: include/notifier.php | |||||
| * | | disable voting in blocks, layouts and webpages | Mario Vavti | 2015-04-29 | 1 | -0/+2 | |
| |/ | ||||||
| * | Provide webpage layout description | Mario Vavti | 2015-04-25 | 1 | -1/+1 | |
| | | ||||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-24 | 2 | -1/+2 | |
| |\ | ||||||
| | * | add widget class to blocks again by default. we have the wrap variable now ↵ | Mario Vavti | 2015-04-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | to remove the div wrapper if necessary. | |||||
| | * | provide block titles in blocklist | Mario Vavti | 2015-04-24 | 1 | -0/+1 | |
| | | | ||||||
| * | | zotfeed issues | friendica | 2015-04-24 | 1 | -3/+3 | |
| | | | ||||||
| * | | mod/branchtopic - move an off-topic comment to its own thread as a fresh ↵ | friendica | 2015-04-24 | 1 | -1/+1 | |
| |/ | | | | | | | wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. | |||||
| * | block unfederated posts from zot_feed | friendica | 2015-04-23 | 1 | -0/+6 | |
| | | ||||||
| * | disconnect | friendica | 2015-04-23 | 1 | -7/+15 | |
| | | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 58 | -3887/+5463 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | fix webpage perms | Mario Vavti | 2015-04-22 | 1 | -1/+1 | |
| | | ||||||
| * | use PERMS_SPECIFIC for anything that hasn't been specified. This way there's ↵ | friendica | 2015-04-21 | 1 | -24/+24 | |
| | | | | | | | | 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. | |||||
| * | issue #162 | friendica | 2015-04-20 | 1 | -0/+1 | |
| | | ||||||
| * | issue #176, sender copy of item not obscured if using private mention | friendica | 2015-04-20 | 1 | -1/+3 | |
| | | ||||||
| * | force event obj_type on update | friendica | 2015-04-20 | 1 | -1/+2 | |
| | | ||||||
| * | issue #157, provide default directory sort order | friendica | 2015-04-19 | 1 | -1/+7 | |
| | | ||||||
| * | doco updates | friendica | 2015-04-19 | 1 | -3/+0 | |
| | | ||||||
| * | add favorites/create and destroy to api | friendica | 2015-04-19 | 1 | -36/+137 | |
| | | ||||||
| * | api performance enhancer | friendica | 2015-04-19 | 1 | -5/+2 | |
| | | ||||||
| * | assorted fixes to api direct messages | friendica | 2015-04-19 | 1 | -31/+35 | |
| | | ||||||
| * | some api cleanup | friendica | 2015-04-19 | 1 | -11/+15 | |
| | | ||||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-19 | 2 | -53/+31 | |
| |\ | ||||||
| | * | attach an id to menues, allow $menu_title to be empty, if no custom menu ↵ | Mario Vavti | 2015-04-19 | 1 | -6/+8 | |
| | | | | | | | | | | | | class is provided use default redbasic classes | |||||
| | * | Introduce wrap variable in comanche blocks (if set to none the block will ↵ | Mario Vavti | 2015-04-19 | 2 | -47/+23 | |
| | | | | | | | | | | | | not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo | |||||
| * | | api - unobscure mail | friendica | 2015-04-19 | 2 | -4/+15 | |
| |/ | ||||||
| * | log this since we may need it to track down failures | friendica | 2015-04-18 | 1 | -2/+3 | |
| | | ||||||
| * | remove failed experiment | friendica | 2015-04-17 | 1 | -2/+0 | |
| | | ||||||
| * | add last post to api/account/verify_credentials | friendica | 2015-04-17 | 1 | -5/+60 | |
| | | ||||||
| * | allow jot to be displayed expanded, remove deprected datetimepicker js and ↵ | Mario Vavti | 2015-04-17 | 1 | -1/+2 | |
| | | | | | | | | some random fixes | |||||
| * | provide a separate input field for rpost attachments | Mario Vavti | 2015-04-16 | 1 | -0/+1 | |
| | | ||||||
| * | don't show directory keywords widget if globaldir setting is off | friendica | 2015-04-15 | 1 | -0/+5 | |
| | | ||||||
| * | title=>name | Mario Vavti | 2015-04-15 | 1 | -1/+1 | |
| | | ||||||
| * | match parens | friendica | 2015-04-14 | 1 | -1/+1 | |
| | | ||||||
| * | post_activity_item incorrectly setting the obj_type when a valid type was ↵ | friendica | 2015-04-14 | 1 | -1/+1 | |
| | | | | | | | | specified | |||||
| * | dont suggest anything here it explains itself | Mario Vavti | 2015-04-14 | 1 | -1/+1 | |
| | | ||||||
| * | some more on webpages | Mario Vavti | 2015-04-14 | 1 | -12/+15 | |
| | | ||||||
| * | remove widget class from webpage blocks and make titles h2 to match the rest ↵ | Mario Vavti | 2015-04-13 | 1 | -1/+1 | |
| | | | | | | | | of the matrix | |||||
| * | make dropItem more universal and move delete up in the dropdown menu | Mario Vavti | 2015-04-12 | 1 | -1/+1 | |
| | | ||||||
| * | make fs deletion of directories work | Mario Vavti | 2015-04-12 | 1 | -2/+2 | |
| | | ||||||
| * | reverse file activity logic | Mario Vavti | 2015-04-12 | 1 | -2/+2 | |
| | | ||||||
| * | move style to style.css | Mario Vavti | 2015-04-10 | 1 | -3/+3 | |
| | | ||||||
| * | make r# work better with different font sizes | Mario Vavti | 2015-04-10 | 1 | -3/+3 | |
| | |