| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 1 | -0/+2 | |
| |\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | |||||
| | * | css fixes | Mario Vavti | 2015-06-27 | 1 | -0/+2 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 1 | -60/+13 | |
| |\| | | | | | | | | | | | Conflicts: include/items.php mod/item.php | |||||
| | * | some work on directory | Mario Vavti | 2015-06-23 | 1 | -60/+13 | |
| | | | ||||||
| * | | more work on items | redmatrix | 2015-06-11 | 1 | -2/+1 | |
| |\| | | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php | |||||
| | * | fix rendering of affinity slider | Mario Vavti | 2015-06-11 | 1 | -2/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 1 | -4/+2 | |
| |\| | ||||||
| | * | assign right aside the same width as we have in left aside but hide it on ↵ | Mario Vavti | 2015-06-10 | 1 | -4/+2 | |
| | | | | | | | | | small and xs screens. make aside width a variablee for easier handling. | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 1 | -1/+14 | |
| |\| | ||||||
| | * | some fixes to make menu sharing work and expose it in the ui. | Mario Vavti | 2015-05-29 | 1 | -4/+4 | |
| | | | ||||||
| | * | show created/edited dates for menus | Mario Vavti | 2015-05-29 | 1 | -1/+14 | |
| | | | ||||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 2 | -7/+8 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php | |||||
| | * | provide ability to create submenus | Mario Vavti | 2015-05-10 | 2 | -4/+5 | |
| | | | ||||||
| | * | adjust icon size | Mario Vavti | 2015-05-07 | 1 | -3/+3 | |
| | | | ||||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-29 | 3 | -3/+44 | |
| |\| | | | | | | | | | Conflicts: include/notifier.php | |||||
| | * | Provide webpage layout description | Mario Vavti | 2015-04-25 | 1 | -3/+7 | |
| | | | ||||||
| | * | css fixes | Mario Vavti | 2015-04-24 | 2 | -0/+8 | |
| | | | ||||||
| | * | provide block titles in blocklist | Mario Vavti | 2015-04-24 | 1 | -4/+4 | |
| | | | ||||||
| | * | webpages layout fixes | Mario Vavti | 2015-04-24 | 1 | -0/+29 | |
| | | | ||||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-23 | 17 | -131/+205 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+29 | |
| | | | ||||||
| | * | provide headings for blocks and layouts | Mario Vavti | 2015-04-22 | 2 | -0/+6 | |
| | | | ||||||
| | * | move .lockview to style.css and a typo | Mario Vavti | 2015-04-21 | 1 | -4/+0 | |
| | | | ||||||
| | * | bring lockstate to webpages | Mario Vavti | 2015-04-21 | 1 | -4/+4 | |
| | | | ||||||
| | * | rework and hopefully improve webpage menu creation workflow | Mario Vavti | 2015-04-21 | 2 | -10/+20 | |
| | | | ||||||
| | * | attach an id to menues, allow $menu_title to be empty, if no custom menu ↵ | Mario Vavti | 2015-04-19 | 1 | -1/+0 | |
| | | | | | | | | | class is provided use default redbasic classes | |||||
| | * | allow jot to be displayed expanded, remove deprected datetimepicker js and ↵ | Mario Vavti | 2015-04-17 | 1 | -9/+0 | |
| | | | | | | | | | some random fixes | |||||
| | * | provide a separate input field for rpost attachments | Mario Vavti | 2015-04-16 | 1 | -1/+6 | |
| | | | ||||||
| | * | move share webpage element from editwebpage to webpages and make it ↵ | Mario Vavti | 2015-04-16 | 1 | -4/+4 | |
| | | | | | | | | | shareable with rpost | |||||
| | * | css fixes and remove expert mode for block page content type | Mario Vavti | 2015-04-14 | 1 | -1/+1 | |
| | | | ||||||
| | * | some more on webpages | Mario Vavti | 2015-04-14 | 1 | -1/+2 | |
| | | | ||||||
| | * | webpages appearence | Mario Vavti | 2015-04-13 | 1 | -4/+38 | |
| | | | ||||||
| | * | reverse file activity logic | Mario Vavti | 2015-04-12 | 1 | -1/+2 | |
| | | | ||||||
| | * | make jRange behave again | Mario Vavti | 2015-04-09 | 1 | -21/+4 | |
| | | | ||||||
| | * | allow webpage for home to use its own layout file | friendica | 2015-03-31 | 1 | -0/+1 | |
| | | | ||||||
| | * | Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it ↵ | Mario Vavti | 2015-03-27 | 2 | -5/+11 | |
| | | | | | | | | | there). Comment out some most probably deprecated js includes. Some css cleanup. | |||||
| | * | minor tweak on event form | friendica | 2015-03-26 | 1 | -1/+2 | |
| | | | ||||||
| | * | bring event form into line with other forms | friendica | 2015-03-26 | 1 | -3/+9 | |
| | | | ||||||
| | * | indicate new or updated items | Mario Vavti | 2015-03-23 | 1 | -1/+0 | |
| | | | ||||||
| | * | fix the map embed issue by keeping the map visible but moving it far off the ↵ | friendica | 2015-03-17 | 1 | -1/+6 | |
| | | | | | | | | | screen. | |||||
| | * | display a map for photos if allowed. Note: there is a bug in that if the map ↵ | friendica | 2015-03-16 | 1 | -0/+1 | |
| | | | | | | | | | div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out. | |||||
| | * | assure that badges will be displayed as circles no matter what font is used ↵ | Mario Vavti | 2015-03-14 | 1 | -2/+12 | |
| | | | | | | | | | and if there is only one digit inside. move css to its proper place | |||||
| | * | some work on feature/addon settings | Mario Vavti | 2015-03-12 | 1 | -14/+0 | |
| | | | ||||||
| | * | buttons for admin_accounts + admin_channels | friendica | 2015-03-09 | 1 | -0/+4 | |
| | | | ||||||
| | * | cleanup mail buttons | friendica | 2015-03-04 | 1 | -6/+2 | |
| | | | ||||||
| | * | add the tag hijacking preference to Diaspora settings | friendica | 2015-03-03 | 1 | -2/+2 | |
| | | | ||||||
| | * | group/collection edit page cleanup | friendica | 2015-03-03 | 1 | -4/+4 | |
| | | | ||||||
| | * | some more work on settings | Mario Vavti | 2015-03-02 | 1 | -56/+1 | |
| | | | ||||||
| | * | first pile of work on settings | Mario Vavti | 2015-03-01 | 2 | -11/+8 | |
| | | | ||||||
| | * | some css fixes for settings | Mario Vavti | 2015-02-28 | 1 | -3/+2 | |
| | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |