Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | adjust icon size | Mario Vavti | 2015-05-07 | 2 | -5/+5 | |
| | | | | ||||||
| * | | | missed one... | redmatrix | 2015-05-06 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | change notification colour | redmatrix | 2015-05-06 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-06 | 3 | -0/+28 | |
| |\| | | ||||||
| | * | | allow blocks to have custom classes and add a new template called zen which ↵ | Mario Vavti | 2015-05-06 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | gives you an empty page to work with | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-05 | 5 | -8101/+8002 | |
| | |\ \ | ||||||
| | * | | | turn consensus items into diaspora polls for that network | redmatrix | 2015-05-05 | 2 | -0/+18 | |
| | | | | | ||||||
| * | | | | second pass name change | redmatrix | 2015-05-05 | 43 | -236/+236 | |
| | | | | | ||||||
| * | | | | first pass name change | redmatrix | 2015-05-05 | 22 | -363/+363 | |
| | |/ / | |/| | | ||||||
| * | | | Merge pull request #317 from tuscanhobbit/dev | Paolo T | 2015-05-04 | 2 | -4048/+3998 | |
| |\ \ \ | | | |/ | | |/| | Italian translation | |||||
| | * | | Italian translation | Paolo Tacconi | 2015-05-04 | 2 | -4048/+3998 | |
| | | | | ||||||
| * | | | fix center page content setting | Mario Vavti | 2015-05-04 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Updating Dutch | jeroenpraat | 2015-05-02 | 2 | -4052/+4002 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'master' into tres | friendica | 2015-04-29 | 8 | -21/+102 | |
|\| | | | | | | | | | | | | | | Conflicts: include/notifier.php | |||||
| * | | fix block view | Mario Vavti | 2015-04-29 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-28 | 1 | -1/+0 | |
| |\ \ | ||||||
| | * | | revert some changes in justified gallery | Mario Vavti | 2015-04-28 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | version update | friendica | 2015-04-28 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Provide webpage layout description | Mario Vavti | 2015-04-25 | 2 | -4/+12 | |
| | | | ||||||
| * | | css fixes | Mario Vavti | 2015-04-24 | 2 | -0/+8 | |
| | | | ||||||
| * | | provide block titles in blocklist | Mario Vavti | 2015-04-24 | 2 | -7/+11 | |
| | | | ||||||
| * | | webpages layout fixes | Mario Vavti | 2015-04-24 | 3 | -13/+75 | |
| | | | ||||||
* | | | Merge branch 'master' into tres | friendica | 2015-04-23 | 160 | -28987/+32063 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -24/+95 | |
| | | | ||||||
| * | | provide headings for blocks and layouts | Mario Vavti | 2015-04-22 | 4 | -2/+36 | |
| | | | ||||||
| * | | missing class | Mario Vavti | 2015-04-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | move .lockview to style.css and a typo | Mario Vavti | 2015-04-21 | 2 | -5/+5 | |
| | | | ||||||
| * | | missing dropdown class | Mario Vavti | 2015-04-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | bring lockstate to webpages | Mario Vavti | 2015-04-21 | 2 | -4/+7 | |
| | | | ||||||
| * | | bring lockview to menu items, slightly change the way /lockview is called | Mario Vavti | 2015-04-21 | 7 | -21/+20 | |
| | | | ||||||
| * | | rework and hopefully improve webpage menu creation workflow | Mario Vavti | 2015-04-21 | 9 | -93/+138 | |
| | | | ||||||
| * | | issue #162 | friendica | 2015-04-20 | 2 | -1/+2 | |
| | | | ||||||
| * | | attach an id to menues, allow $menu_title to be empty, if no custom menu ↵ | Mario Vavti | 2015-04-19 | 2 | -16/+12 | |
| | | | | | | | | | | | | 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 | 1 | -1/+1 | |
| | | | | | | | | | | | | not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo | |||||
| * | | css fix | Mario Vavti | 2015-04-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | fix page-title margin | Mario Vavti | 2015-04-18 | 1 | -0/+4 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-17 | 6 | -34/+26 | |
| |\ \ | ||||||
| | * | | adjus webpage font size to match conv item font size | Mario Vavti | 2015-04-17 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | allow jot to be displayed expanded, remove deprected datetimepicker js and ↵ | Mario Vavti | 2015-04-17 | 6 | -33/+24 | |
| | | | | | | | | | | | | | | | | some random fixes | |||||
| * | | | hide event share button when editing an event | friendica | 2015-04-17 | 1 | -0/+4 | |
| |/ / | ||||||
| * | | wording and css fixes | Mario Vavti | 2015-04-16 | 1 | -3/+2 | |
| | | | ||||||
| * | | provide a separate input field for rpost attachments | Mario Vavti | 2015-04-16 | 5 | -9/+23 | |
| | | | ||||||
| * | | move share webpage element from editwebpage to webpages and make it ↵ | Mario Vavti | 2015-04-16 | 2 | -4/+8 | |
| | | | | | | | | | | | | shareable with rpost | |||||
| * | | Added string for item ID in view source | mrjive | 2015-04-15 | 1 | -0/+1 | |
| | | | ||||||
| * | | title=>name | Mario Vavti | 2015-04-15 | 1 | -5/+5 | |
| | | | ||||||
| * | | css fixes and remove expert mode for block page content type | Mario Vavti | 2015-04-14 | 2 | -2/+2 | |
| | | | ||||||
| * | | some more on webpages | Mario Vavti | 2015-04-14 | 1 | -1/+2 | |
| | | | ||||||
| * | | webpages appearence | Mario Vavti | 2015-04-13 | 6 | -37/+106 | |
| | | | ||||||
| * | | add bs classes to design tools menu | Mario Vavti | 2015-04-13 | 3 | -24/+2 | |
| | | | ||||||
| * | | remove superfluous view/preview buttons | Mario Vavti | 2015-04-13 | 1 | -2/+0 | |
| | | |