Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tres | friendica | 2015-04-29 | 8 | -54/+91 |
|\ | | | | | | | | | Conflicts: include/notifier.php | ||||
| * | disable voting in blocks, layouts and webpages | Mario Vavti | 2015-04-29 | 3 | -2/+5 |
| | | |||||
| * | fix $noloc state in mod editwebpages | Mario Vavti | 2015-04-29 | 1 | -1/+1 |
| | | |||||
| * | adjust placeholder naming | Mario Vavti | 2015-04-29 | 2 | -2/+3 |
| | | |||||
| * | Provide webpage layout description | Mario Vavti | 2015-04-25 | 1 | -2/+5 |
| | | |||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-24 | 5 | -46/+32 |
| |\ | |||||
| | * | provide block titles in blocklist | Mario Vavti | 2015-04-24 | 1 | -1/+3 |
| | | | |||||
| | * | add title to element array | Mario Vavti | 2015-04-24 | 3 | -3/+5 |
| | | | |||||
| | * | there is no key named term in this array | Mario Vavti | 2015-04-24 | 1 | -1/+0 |
| | | | |||||
| | * | copy/paste typo | Mario Vavti | 2015-04-24 | 1 | -1/+1 |
| | | | |||||
| | * | webpages layout fixes | Mario Vavti | 2015-04-24 | 3 | -43/+26 |
| | | | |||||
| * | | reset route | friendica | 2015-04-24 | 1 | -1/+1 |
| | | | |||||
| * | | mod/branchtopic - move an off-topic comment to its own thread as a fresh ↵ | friendica | 2015-04-24 | 1 | -0/+42 |
| |/ | | | | | | | wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-23 | 2 | -32/+27 |
| |\ | |||||
| * | | disconnect | friendica | 2015-04-23 | 1 | -3/+5 |
| | | | |||||
* | | | Merge branch 'master' into tres | friendica | 2015-04-23 | 61 | -1388/+2323 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | webpages blocks fixes | Mario Vavti | 2015-04-23 | 2 | -32/+27 |
| |/ | |||||
| * | do not show acl button if not owner | Mario Vavti | 2015-04-22 | 1 | -3/+4 |
| | | |||||
| * | fix webpages profile_tabs | Mario Vavti | 2015-04-22 | 1 | -5/+2 |
| | | |||||
| * | fix webpage perms | Mario Vavti | 2015-04-22 | 2 | -2/+11 |
| | | |||||
| * | provide headings for blocks and layouts | Mario Vavti | 2015-04-22 | 3 | -8/+15 |
| | | |||||
| * | bring lockstate to webpages | Mario Vavti | 2015-04-21 | 1 | -1/+5 |
| | | |||||
| * | bring lockview to menu items, slightly change the way /lockview is called | Mario Vavti | 2015-04-21 | 2 | -14/+26 |
| | | |||||
| * | rework and hopefully improve webpage menu creation workflow | Mario Vavti | 2015-04-21 | 2 | -107/+120 |
| | | |||||
| * | issue #176, sender copy of item not obscured if using private mention | friendica | 2015-04-20 | 1 | -1/+1 |
| | | |||||
| * | issue #178, searching for words such as 'data' would return private items ↵ | friendica | 2015-04-19 | 1 | -2/+4 |
| | | | | | | | | regardless of their unobscured content. | ||||
| * | issue #157, provide default directory sort order | friendica | 2015-04-19 | 1 | -1/+5 |
| | | |||||
| * | switch from IMG_XXX constants to IMAGETYPE_XXX constants | Michael Johnston | 2015-04-19 | 1 | -1/+1 |
| | | |||||
| * | log this since we may need it to track down failures | friendica | 2015-04-18 | 1 | -0/+1 |
| | | |||||
| * | allow jot to be displayed expanded, remove deprected datetimepicker js and ↵ | Mario Vavti | 2015-04-17 | 3 | -15/+15 |
| | | | | | | | | some random fixes | ||||
| * | wording and css fixes | Mario Vavti | 2015-04-16 | 1 | -1/+1 |
| | | |||||
| * | provide a separate input field for rpost attachments | Mario Vavti | 2015-04-16 | 2 | -1/+2 |
| | | |||||
| * | make rpost respect default post permissions | Mario Vavti | 2015-04-16 | 1 | -1/+8 |
| | | |||||
| * | whitespace | Mario Vavti | 2015-04-16 | 1 | -15/+15 |
| | | |||||
| * | move share webpage element from editwebpage to webpages and make it ↵ | Mario Vavti | 2015-04-16 | 2 | -18/+16 |
| | | | | | | | | shareable with rpost | ||||
| * | Update viewsrc.php | mrjive | 2015-04-15 | 1 | -1/+2 |
| | | | | | | Adding the item ID to the item source view | ||||
| * | funny I should mention comanche preview (yesterday) as clicking the view ↵ | friendica | 2015-04-14 | 1 | -17/+15 |
| | | | | | | | | 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'. | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-14 | 3 | -16/+8 |
| |\ | |||||
| | * | css fixes and remove expert mode for block page content type | Mario Vavti | 2015-04-14 | 2 | -11/+3 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-04-14 | 2 | -6/+11 |
| | |\ | |||||
| | * | | some more on webpages | Mario Vavti | 2015-04-14 | 2 | -5/+5 |
| | | | | |||||
| * | | | default perms not being set in some cases | friendica | 2015-04-14 | 1 | -0/+10 |
| | |/ | |/| | |||||
| * | | unquote binary | Habeas Codice | 2015-04-13 | 1 | -2/+3 |
| | | | |||||
| * | | item_check_service_class wasn't returning correct results | friendica | 2015-04-13 | 1 | -4/+8 |
| |/ | |||||
| * | webpages appearence | Mario Vavti | 2015-04-13 | 1 | -2/+5 |
| | | |||||
| * | reverse file activity logic | Mario Vavti | 2015-04-12 | 2 | -5/+5 |
| | | |||||
| * | program the affinity slider labels | friendica | 2015-04-09 | 1 | -6/+22 |
| | | |||||
| * | make sure we redirect to a sane place after deleting a webpage element | friendica | 2015-04-09 | 3 | -0/+6 |
| | | |||||
| * | system channel always has allow_code privileges | friendica | 2015-04-08 | 1 | -1/+1 |
| | | |||||
| * | update features, allow sys account page deletion | friendica | 2015-04-08 | 1 | -0/+4 |
| | |