Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ | |||||
| | * | Removed redmatrix.nl as a fallback server (directory mode to normal) + ↵ | jeroenpraat | 2015-08-29 | 3 | -56/+55 |
| | | | | | | | | | | | | update strings ES | ||||
| | * | Update es and nl strings | jeroenpraat | 2015-08-28 | 4 | -245/+257 |
| | | | |||||
| * | | change the likes db structure to make it more easily importable/exportable | redmatrix | 2015-08-31 | 8 | -258/+282 |
| |/ | |||||
* | | mostly doc tweaks, some import/export work | redmatrix | 2015-08-31 | 5 | -28/+23 |
| | | |||||
* | | update history | redmatrix | 2015-08-31 | 1 | -6/+12 |
| | | |||||
* | | documentation re-org | redmatrix | 2015-08-31 | 7 | -73/+90 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-08-31 | 7 | -1/+1 |
|\ \ | |||||
| * | | Changed favicon to new one (based on new Hubzilla arrow). Please revert when ↵ | jeroenpraat | 2015-08-31 | 7 | -1/+1 |
| | | | | | | | | | | | | it's not okay. Also added a new optional default profile photo, in the same style. | ||||
* | | | rename 'register_account' hook to 'create_identity'. | redmatrix | 2015-08-31 | 2 | -13/+15 |
|/ / | |||||
* | | unclosed link tags | redmatrix | 2015-08-30 | 2 | -6/+9 |
| | | |||||
* | | schedule a doco update once weekly | redmatrix | 2015-08-30 | 2 | -0/+34 |
| | | |||||
* | | more work on doco search | redmatrix | 2015-08-30 | 5 | -1/+30 |
| | | |||||
* | | improvements to documentation search | redmatrix | 2015-08-30 | 2 | -34/+18 |
| | | |||||
* | | more AccessList stuff - this time it's mod-item, which is a biggie | redmatrix | 2015-08-28 | 2 | -73/+20 |
| | | |||||
* | | now we get to the heavy lifting with AccessList stuff | redmatrix | 2015-08-27 | 3 | -83/+48 |
| | | |||||
* | | more work on AccessList integration | redmatrix | 2015-08-27 | 9 | -139/+113 |
| | | |||||
* | | start conversion to AccessList object | redmatrix | 2015-08-27 | 3 | -25/+20 |
| | | |||||
* | | First attempt to turn access control into an object class. The access ↵ | redmatrix | 2015-08-27 | 2 | -0/+75 |
| | | | | | | | | control manipulation is getting too complex and this will help keep it manageable and reduce a lot of code duplication. | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-27 | 2 | -2/+2 |
|\| | |||||
| * | fallback directory server list update | redmatrix | 2015-08-27 | 2 | -2/+2 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-26 | 1 | -1/+1 |
|\| | |||||
| * | use extended export format for items in api photo_detail | redmatrix | 2015-08-26 | 1 | -1/+1 |
| | | |||||
* | | redphotos updates | redmatrix | 2015-08-26 | 1 | -1/+8 |
| | |