aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-0147-663/+722
|\
| * this is a bit harder than anticipated.redmatrix2015-08-311-14/+15
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-3110-192/+224
| |\
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-315-272/+283
| | |\
| | | * Removed redmatrix.nl as a fallback server (directory mode to normal) + update...jeroenpraat2015-08-293-56/+55
| | | * Update es and nl stringsjeroenpraat2015-08-284-245/+257
| | * | change the likes db structure to make it more easily importable/exportableredmatrix2015-08-318-258/+282
| | |/
| * | mostly doc tweaks, some import/export workredmatrix2015-08-315-28/+23
| * | update historyredmatrix2015-08-311-6/+12
| * | documentation re-orgredmatrix2015-08-317-73/+90
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-08-317-1/+1
| |\ \
| | * | Changed favicon to new one (based on new Hubzilla arrow). Please revert when ...jeroenpraat2015-08-317-1/+1
| * | | rename 'register_account' hook to 'create_identity'.redmatrix2015-08-312-13/+15
| |/ /
| * | unclosed link tagsredmatrix2015-08-302-6/+9
| * | schedule a doco update once weeklyredmatrix2015-08-302-0/+34
| * | more work on doco searchredmatrix2015-08-305-1/+30
| * | improvements to documentation searchredmatrix2015-08-302-34/+18
| * | more AccessList stuff - this time it's mod-item, which is a biggieredmatrix2015-08-282-73/+20
| * | now we get to the heavy lifting with AccessList stuffredmatrix2015-08-273-83/+48
| * | more work on AccessList integrationredmatrix2015-08-279-139/+113
| * | start conversion to AccessList objectredmatrix2015-08-273-25/+20
| * | First attempt to turn access control into an object class. The access control...redmatrix2015-08-272-0/+75
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-272-2/+2
| |\|
| | * fallback directory server list updateredmatrix2015-08-272-2/+2
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-2723-1165/+1188
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-261-1/+1
| |\|
| | * use extended export format for items in api photo_detailredmatrix2015-08-261-1/+1
| * | redphotos updatesredmatrix2015-08-261-1/+8
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-261-1/+21
| |\|
| | * add item info to photo detail in apiredmatrix2015-08-261-1/+21
| * | change attach_store to allow a predefined item to accompany a photoredmatrix2015-08-262-44/+82
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-261-1/+12
| |\|
| | * support likes on comments with diaspora owner by sending as activityredmatrix2015-08-261-14/+19
| | * required for future workredmatrix2015-08-261-1/+12
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-262-2/+1
| |\|
| | * syntax error in last checkinredmatrix2015-08-261-4/+4
| | * import fixesredmatrix2015-08-262-2/+34
| * | import fixesredmatrix2015-08-261-2/+15
| * | add repository type as one that is able to self-identify as a public forumredmatrix2015-08-251-1/+1
| * | this is weirdredmatrix2015-08-254-205/+191
| * | make diaspora person guids for hubzilla folks globally unique. That's what a ...redmatrix2015-08-252-1/+5
| * | lots of stuff that was needed for successful photo import from redredmatrix2015-08-242-17/+81
| * | don't try to optimise the session table. Just let it fragment and let the DB ...redmatrix2015-08-241-3/+0
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-242-138/+1
| |\|
| | * remove orphan mod_connections editing code (now done in mod/connedit)redmatrix2015-08-244-144/+13
| * | edited event showing bad signature and null_date for edit timestampredmatrix2015-08-242-1/+12
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-234-745/+745
| |\|
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-232-743/+743
| | |\
| | | * Final (temporary I suppose) Spanish string updatejeroenpraat2015-08-222-743/+743
| | * | issues with abook sync between hubzilla and redredmatrix2015-08-234-87/+92
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 22:13:08 +0000