Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -0/+13 |
|\ | | | | | | | | | | | | | Conflicts: include/items.php view/it/messages.po view/it/strings.php | ||||
| * | sync posted top level items rather than deliver them (actually we do both, ↵ | redmatrix | 2015-09-07 | 1 | -3/+30 |
| | | | | | | | | but sync comes first). This way we get the ACL transferred. | ||||
| * | sync "things" (obj elements) | redmatrix | 2015-09-02 | 1 | -0/+28 |
| | | |||||
* | | consolidate import_items/sync_items | redmatrix | 2015-09-07 | 3 | -99/+29 |
| | | |||||
* | | Always open rpost editor on document ready | redmatrix | 2015-09-06 | 1 | -9/+6 |
| | | |||||
* | | use conversation defaults for /public page instead of collapsed list mode, ↵ | redmatrix | 2015-09-06 | 1 | -3/+5 |
| | | | | | | | | but allow over-ride | ||||
* | | syntax | redmatrix | 2015-09-05 | 1 | -1/+1 |
| | | |||||
* | | fix typos before pushing0.9 | redmatrix | 2015-09-03 | 1 | -1/+1 |
| | | |||||
* | | import and sync chatrooms | redmatrix | 2015-09-03 | 2 | -1/+6 |
| | | |||||
* | | profile import error #34 | redmatrix | 2015-09-03 | 1 | -3/+2 |
| | | |||||
* | | start to modularise the clone import and sync functions | redmatrix | 2015-09-02 | 2 | -204/+51 |
| | | |||||
* | | import apps | redmatrix | 2015-09-01 | 1 | -0/+23 |
| | | |||||
* | | initial work on obj import, rename import_profile_photo to ↵ | redmatrix | 2015-09-01 | 3 | -19/+32 |
| | | | | | | | | import_xchan_photo to more accurately state its purpose. | ||||
* | | provide consistent ui for things | redmatrix | 2015-09-01 | 1 | -5/+16 |
| | | |||||
* | | more work on objs/things | redmatrix | 2015-09-01 | 1 | -30/+26 |
| | | |||||
* | | issue #31 | redmatrix | 2015-09-01 | 1 | -1/+1 |
| | | |||||
* | | separate objs/things from taxonomy | redmatrix | 2015-09-01 | 2 | -33/+35 |
| | | |||||
* | | 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 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po | ||||
| * | change the likes db structure to make it more easily importable/exportable | redmatrix | 2015-08-31 | 1 | -1/+2 |
| | | |||||
* | | mostly doc tweaks, some import/export work | redmatrix | 2015-08-31 | 2 | -4/+21 |
| | | |||||
* | | more work on doco search | redmatrix | 2015-08-30 | 1 | -1/+4 |
| | | |||||
* | | 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 | 1 | -72/+19 |
| | | |||||
* | | now we get to the heavy lifting with AccessList stuff | redmatrix | 2015-08-27 | 2 | -26/+19 |
| | | |||||
* | | more work on AccessList integration | redmatrix | 2015-08-27 | 5 | -81/+50 |
| | | |||||
* | | start conversion to AccessList object | redmatrix | 2015-08-27 | 1 | -7/+3 |
| | | |||||
* | | First attempt to turn access control into an object class. The access ↵ | redmatrix | 2015-08-27 | 1 | -0/+3 |
| | | | | | | | | 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-26 | 1 | -1/+0 |
|\| | | | | | | | | | Conflicts: mod/import.php | ||||
| * | syntax error in last checkin | redmatrix | 2015-08-26 | 1 | -4/+4 |
| | | |||||
| * | import fixes | redmatrix | 2015-08-26 | 1 | -1/+33 |
| | | |||||
* | | import fixes | redmatrix | 2015-08-26 | 1 | -2/+15 |
| | | |||||
* | | add repository type as one that is able to self-identify as a public forum | redmatrix | 2015-08-25 | 1 | -1/+1 |
| | | |||||
* | | this is weird | redmatrix | 2015-08-25 | 1 | -200/+186 |
| | | |||||
* | | make diaspora person guids for hubzilla folks globally unique. That's what a ↵ | redmatrix | 2015-08-25 | 1 | -1/+1 |
| | | | | | | | | globally unique ID is. This forever kills the prospect of making nomadic identity work flawlessly on Diaspora. But since all your identities have the same guid, this allows your different identities to communicate with Diaspora; which would otherwise fail to connect to your other instances because of the guid collision. | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-24 | 1 | -137/+0 |
|\| | | | | | | | | | | | Conflicts: mod/connections.php mod/connedit.php | ||||
| * | remove orphan mod_connections editing code (now done in mod/connedit) | redmatrix | 2015-08-24 | 2 | -140/+12 |
| | | |||||
* | | edited event showing bad signature and null_date for edit timestamp | redmatrix | 2015-08-24 | 1 | -0/+5 |
| | | |||||
* | | sync abook flags in memory after altering them | redmatrix | 2015-08-23 | 1 | -0/+11 |
| | | |||||
* | | change name of module | redmatrix | 2015-08-22 | 3 | -6/+8 |
| | | |||||
* | | restrict event notification to events and birthdays (exclude tasks) | redmatrix | 2015-08-22 | 1 | -0/+2 |
| | | |||||
* | | cleanup of task widget - make jquery workflow a bit smoother | redmatrix | 2015-08-20 | 1 | -22/+32 |
| | | |||||
* | | more work on tasks | redmatrix | 2015-08-20 | 2 | -9/+25 |
| | | |||||
* | | We don't need photos to also include attachments. It's interesting, but not ↵ | redmatrix | 2015-08-20 | 1 | -0/+1 |
| | | | | | | | | all that useful. | ||||
* | | some event related fixes and some base work for implementing native tasks ↵ | redmatrix | 2015-08-20 | 2 | -10/+99 |
| | | | | | | | | (to-do lists); which should already be importable and exportable. | ||||
* | | do ical export before checking logged in channel | redmatrix | 2015-08-20 | 1 | -23/+21 |
| | | |||||
* | | check perms on ical attachments | redmatrix | 2015-08-19 | 1 | -3/+6 |
| | | |||||
* | | event integration improvements | redmatrix | 2015-08-19 | 2 | -1/+31 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-18 | 1 | -1/+1 |
|\| | |||||
| * | add month to export filename when using month | redmatrix | 2015-08-17 | 1 | -1/+1 |
| | |