| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | sync abook entries from redmatrix | redmatrix | 2015-07-02 | 12 | -610/+1013 |
| |\ | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-01 | 10 | -609/+991 |
| | |\ | |||||
| | | * | Merge pull request #365 from adsfkajlsfdas/master | git-marijus | 2015-07-01 | 4 | -35/+1 |
| | | |\ | | | | | | | | | Clean up | ||||
| | | | * | Clean up | Thomas Willingham | 2015-06-30 | 4 | -35/+1 |
| | | | | | |||||
| | | * | | since we can now use plain upstream justifiedGallery library - switch to ↵ | Mario Vavti | 2015-07-01 | 3 | -2/+16 |
| | | | | | | | | | | | | | | | | | minified version | ||||
| | | * | | update justifiedGallery to versio 3.6.0 | Mario Vavti | 2015-07-01 | 3 | -572/+974 |
| | | |/ | |||||
| | * / | provide backward compatibility with hubzilla extended item export | redmatrix | 2015-07-01 | 2 | -1/+56 |
| | |/ | |||||
| * | | provide compatibility with redmatrix extended item export | redmatrix | 2015-07-01 | 1 | -3/+50 |
| | | | |||||
| * | | turn attached audio/video into audio/video elements as well as providing an ↵ | redmatrix | 2015-07-01 | 2 | -3/+8 |
| | | | | | | | | | attachment link | ||||
| * | | cleanup of import to allow cross-product import going one way. Note - ↵ | redmatrix | 2015-06-30 | 1 | -9/+4 |
| | | | | | | | | | items/content are not yet importable | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-30 | 1 | -0/+14 |
| |\| | |||||
| | * | warn if export data file is from an incompatible project or if the DB ↵ | redmatrix | 2015-06-29 | 1 | -0/+14 |
| | | | | | | | | | version differs significantly from the current DB. This is to avoid people cloning a hubzilla channel back to red and potentially stuffing up the works. Hopefully we can migrate upwards someday. Downwards is always going to be an issue. | ||||
| * | | lots of work on clone/import from redmatrix to hubzilla (won't go back the ↵ | redmatrix | 2015-06-30 | 2 | -18/+63 |
| | | | | | | | | | other way) | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 4 | -0/+12 |
| |\| | |||||
| | * | turn the connection filter into a feature. | redmatrix | 2015-06-29 | 4 | -0/+12 |
| | | | |||||
| * | | fix the postgres schema with all the changes to date | redmatrix | 2015-06-29 | 2 | -5/+116 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 7 | -7/+110 |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-29 | 5 | -352/+382 |
| | |\ | |||||
| | | * | Update NL + 1 revert css, see comment here: ↵ | jeroenpraat | 2015-06-30 | 3 | -348/+374 |
| | | | | | | | | | | | | | https://github.com/redmatrix/redmatrix/commit/22b9e97ae2e46513c7a43cb27e7230bc5c40b9d4 | ||||
| | | * | Probably a ugly hack, but it's the only way I could found that cuts off very ↵ | jeroenpraat | 2015-06-29 | 1 | -0/+5 |
| | | | | | | | | | | | | | long channel names in the admin area. If there's a better alternative, be my guest. | ||||
| | | * | fix directory location | Mario Vavti | 2015-06-29 | 2 | -4/+3 |
| | | | | |||||
| | * | | some prep work | redmatrix | 2015-06-29 | 3 | -2/+101 |
| | |/ | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 15 | -28/+144 |
| |\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-28 | 3 | -3/+9 |
| | |\ | |||||
| | | * | Merge pull request #363 from solstag/postnotstatus | redmatrix | 2015-06-28 | 1 | -2/+2 |
| | | |\ | | | | | | | | | simply 'post' is a better default term than 'status' | ||||
| | | | * | simply 'post' is a better default term than 'status' | Alexandre Hannud Abdo | 2015-06-27 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | css fixes | Mario Vavti | 2015-06-27 | 2 | -1/+7 |
| | | |/ | |||||
| | * / | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 11 | -25/+128 |
| | |/ | | | | | | | still pretty cool. | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-26 | 1 | -0/+2 |
| | |\ | |||||
| | | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-25 | 4 | -2697/+2871 |
| | | |\ | |||||
| | | * | | directory: only provide connect button if we are not already connected | Mario Vavti | 2015-06-24 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | project updates | redmatrix | 2015-06-26 | 4 | -196/+216 |
| | | |/ | |/| | |||||
| * | | | bring single instance file storage to dav and cloud uploaded photos | redmatrix | 2015-06-27 | 2 | -8/+28 |
| | | | | |||||
| * | | | we aren't using the module_aside functions or hooks any more | redmatrix | 2015-06-25 | 1 | -32/+0 |
| | | | | |||||
| * | | | undo the disabling of browser_prefetch and for the time being revert the ↵ | redmatrix | 2015-06-25 | 9 | -60/+46 |
| | | | | | | | | | | | | | HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more. | ||||
| * | | | remove all QR-code stuff from core - now in qrator addon | redmatrix | 2015-06-25 | 427 | -10438/+0 |
| | | | | |||||
| * | | | localise event calendar | redmatrix | 2015-06-25 | 4 | -55/+139 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-24 | 5 | -15/+109 |
| |\| | | | | | | | | | | | | | | | | | | | | Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php | ||||
| | * | | Merge pull request #360 from zzottel/master | zzottel | 2015-06-24 | 4 | -2697/+2871 |
| | |\ \ | | |/ | |/| | update German strings and help files | ||||
| | | * | update German help files | zottel | 2015-06-24 | 2 | -41/+56 |
| | | | | |||||
| | | * | update to German strings | zottel | 2015-06-24 | 2 | -2656/+2815 |
| | |/ | |||||
| | * | Add a new redbasic scheme called focus - It is supposed to focus on the main ↵ | Mario Vavti | 2015-06-24 | 2 | -0/+92 |
| | | | | | | | | | content by adding a slight shadow and centering the main content on the screen. Also the default width of the content is set to 640px. | ||||
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-24 | 2 | -2/+2 |
| | |\ | |||||
| | * | | Reflect in directory title if we watch the local or the global directory | Mario Vavti | 2015-06-24 | 1 | -2/+3 |
| | | | | |||||
| * | | | more work on photos, including os_storage for the size '0' photo and ↵ | redmatrix | 2015-06-23 | 4 | -17/+69 |
| | | | | | | | | | | | | | numbering duplicate filenames | ||||
| * | | | more work on mail flags | redmatrix | 2015-06-23 | 8 | -38/+26 |
| | | | | |||||
| * | | | item flag fixes discovered after a few merges | redmatrix | 2015-06-23 | 9 | -33/+12 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 15 | -167/+180 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: include/items.php mod/item.php | ||||
| | * | | typo | redmatrix | 2015-06-23 | 2 | -2/+2 |
| | |/ | |||||
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-23 | 4 | -7/+33 |
| | |\ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |