| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-03 | 1 | -5/+7 |
| |\ | | | | | | | | | Conflicts: include/identity.php | ||||
| | * | channel export - don't include linked resource items (photos, events). These ↵ | redmatrix | 2015-09-03 | 1 | -2/+4 |
| | | | | | | | | | items will need to be provided with those objects so that they can be re-linked. | ||||
| * | | profile import error #34 | redmatrix | 2015-09-03 | 1 | -3/+2 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-03 | 1 | -3/+2 |
| |\| | |||||
| | * | in this case no results is not an error | redmatrix | 2015-09-03 | 1 | -3/+2 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-03 | 3 | -13/+20 |
| |\| | |||||
| | * | revision update | redmatrix | 2015-09-03 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #390 from zzottel/master | redmatrix | 2015-09-04 | 2 | -12/+19 |
| | |\ | | | | | | | fix update 1148 | ||||
| | | * | fix update 1148 | zottel | 2015-09-03 | 2 | -12/+19 |
| | |/ | |||||
| * | | bug reporting doc | redmatrix | 2015-09-03 | 2 | -0/+32 |
| | | | |||||
| * | | app sync | redmatrix | 2015-09-02 | 3 | -2/+91 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 3 | -3/+15 |
| |\| | |||||
| | * | more adjustment to apps containers | redmatrix | 2015-09-02 | 1 | -2/+3 |
| | | | |||||
| | * | sort out some app display weirdness | redmatrix | 2015-09-02 | 3 | -3/+14 |
| | | | |||||
| | * | increase height of app-container so edit controls aren't shadowed | redmatrix | 2015-09-02 | 1 | -1/+1 |
| | | | |||||
| * | | add timestamps for syncing apps | redmatrix | 2015-09-02 | 4 | -6/+35 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 2 | -3/+11 |
| |\| | |||||
| | * | dummy update | redmatrix | 2015-09-02 | 2 | -3/+11 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 3 | -5/+8 |
| |\| | | | | | | | | | | | Conflicts: doc/credits.bb mod/thing.php | ||||
| | * | sync "things" (obj elements) | redmatrix | 2015-09-02 | 1 | -0/+28 |
| | | | |||||
| | * | Update the credits | redmatrix | 2015-09-02 | 2 | -5/+7 |
| | | | |||||
| | * | protect from sql injection | redmatrix | 2015-09-02 | 2 | -2/+2 |
| | | | |||||
| * | | start to modularise the clone import and sync functions | redmatrix | 2015-09-02 | 5 | -204/+386 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 1 | -4/+3 |
| |\| | | | | | | | | | Conflicts: include/zot.php | ||||
| | * | Merge pull request #389 from zzottel/master | redmatrix | 2015-09-03 | 1 | -2/+2 |
| | |\ | | | | | | | really fix post filtering | ||||
| | | * | really fix post filtering | zottel | 2015-09-02 | 1 | -2/+2 |
| | |/ | |||||
| * | | obscure mail subject in conversation structure | redmatrix | 2015-09-01 | 1 | -1/+10 |
| | | | |||||
| * | | import apps | redmatrix | 2015-09-01 | 1 | -0/+23 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-01 | 1 | -0/+7 |
| |\| | |||||
| | * | export apps | redmatrix | 2015-09-01 | 1 | -0/+7 |
| | | | |||||
| * | | initial work on obj import, rename import_profile_photo to ↵ | redmatrix | 2015-09-01 | 10 | -31/+44 |
| | | | | | | | | | import_xchan_photo to more accurately state its purpose. | ||||
| * | | match the redmatrix output format for objects (which is the hubzilla table ↵ | redmatrix | 2015-09-01 | 1 | -6/+2 |
| | | | | | | | | | format) | ||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-01 | 1 | -1/+9 |
| |\| | |||||
| | * | add the baseurl so we can easily relocate objects | redmatrix | 2015-09-01 | 1 | -1/+2 |
| | | | |||||
| | * | use different obj export output format for hubzilla compatibility | redmatrix | 2015-09-01 | 1 | -1/+8 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-01 | 2 | -426/+614 |
| |\| | |||||
| | * | cert updates | redmatrix | 2015-09-01 | 3 | -427/+615 |
| | | | |||||
| * | | provide consistent ui for things | redmatrix | 2015-09-01 | 5 | -7/+36 |
| | | | |||||
| * | | more work on objs/things | redmatrix | 2015-09-01 | 1 | -30/+26 |
| | | | |||||
| * | | issue #31 | redmatrix | 2015-09-01 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-01 | 16 | -0/+0 |
| |\ \ | |||||
| | * | | Updated all 300px default profile photos to 300px. Most using the SVG ↵ | jeroenpraat | 2015-09-01 | 16 | -0/+0 |
| | | | | | | | | | | | | | source, some enlarged using the Gimp. | ||||
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-01 | 2 | -2/+1 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: include/identity.php install/update.php | ||||
| | * | | dummy update placeholder | redmatrix | 2015-09-01 | 3 | -3/+10 |
| | | | | |||||
| | * | | typo in sql | redmatrix | 2015-08-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | separate objs/things from taxonomy | redmatrix | 2015-09-01 | 9 | -50/+110 |
| | |/ |/| | |||||
| * | | don't log the mundane - especially at normal levels. | redmatrix | 2015-08-31 | 1 | -2/+3 |
| | | | |||||
| * | | this is a bit harder than anticipated. | redmatrix | 2015-08-31 | 1 | -14/+15 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-31 | 10 | -192/+224 |
| |\| | | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-31 | 5 | -272/+283 |
| | |\ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |