aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Comanche conditionals - provide a conditional "~=" form for testing 'contains...zotlabs2017-01-071-0/+12
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-072-2/+2
|\
| * fix main width if right aside is hiddenMario Vavti2017-01-072-2/+2
* | add enclosures and categories to atom feedzotlabs2017-01-071-19/+50
* | allow the atom_entry hook to change the resultszotlabs2017-01-071-7/+14
* | typozotlabs2017-01-071-1/+1
* | update the atom_entry hookzotlabs2017-01-071-6/+13
* | more feedutils cleanupzotlabs2017-01-061-5/+2
* | add the ostatus:conversation element which is now more or less required by GN...zotlabs2017-01-061-0/+3
* | preserve the original message-id coming from feeds - we will have to escape t...zotlabs2017-01-061-17/+10
* | Merge branch 'dev' into gnusoczotlabs2017-01-0615-2809/+2996
|\|
| * stringszotlabs2017-01-061-2783/+2819
| * setup: check disabled functions more precisely than using a string matchzotlabs2017-01-052-2/+13
| * ical import/export - provide mechanism to preserve original source formatting...zotlabs2017-01-051-13/+52
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-054-7/+13
| |\
| | * same fix for mobile viewMario Vavti2017-01-051-1/+3
| | * fix an issue with sticky_kit where input fields and textareas would blur on r...Mario Vavti2017-01-054-6/+10
| * | issue #639, voting setting is lost after post is edited (also the disabling o...zotlabs2017-01-052-2/+3
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-046-3/+97
| |\|
| | * css fixMario Vavti2017-01-041-2/+2
| | * Fixing some schemasjeroenpraat2017-01-034-0/+85
| | * trigger sticky_kit:recalc if the size of left_aside_wrapper changesMario Vavti2017-01-031-1/+10
* | | some gnusoc fixeszotlabs2017-01-041-3/+29
|/ /
* / zot protocol doco updateszotlabs2017-01-031-4/+35
|/
* fix chat member list when one or members are connected via access tokenszotlabs2017-01-021-3/+17
* set 'adjust for viewer timezone' as the default for new events.zotlabs2017-01-021-3/+6
* Merge pull request #637 from anaqreon/devgit-marijus2017-01-023-4/+17
|\
| * Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2017-01-029-9/+344
| |\ | |/ |/|
* | new roadmapzotlabs2017-01-011-0/+23
* | feature: allow event creation in other timezones than your own.zotlabs2017-01-013-2/+21
* | Merge branch 'pcard' into devzotlabs2017-01-014-1/+294
|\ \
| * | profile vcard - generate vcard on profile updatezotlabs2017-01-011-1/+13
| * | profile vcard - preliminary workzotlabs2017-01-013-0/+281
* | | issue #636 - some localised (e.g. Italian) strings have single quotes which t...zotlabs2017-01-011-6/+6
| | * Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2017-01-010-0/+0
| | |\ | |_|/ |/| |
* | | Merge pull request #634 from anaqreon/devAndrew Manning2017-01-0132-1650/+647
|\ \ \ | |/ / |/| |
| | * Add guest access token section to member guide with screenshot of settingsAndrew Manning2017-01-013-4/+17
| |/
| * Deleted old versions that have been integrated. Integrated and slightly revis...Andrew Manning2017-01-0122-1171/+279
| * Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2017-01-015-6/+15
| |\ | |/ |/|
* | better fix for #629 #635 based on ownership/authorship rather than message fl...zotlabs2016-12-311-11/+6
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-311-1/+1
|\ \
| * | fix expand-aside button hiding if aside is emptyMario Vavti2016-12-311-1/+1
* | | issues #629, #635 - edited post arriving from downstream source was not being...zotlabs2016-12-311-0/+14
|/ /
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-304-13/+5
|\ \
| * | prevent eventual double scrollbarMario Vavti2016-12-301-2/+2
* | | peoplefind widget should honour directory option settings (such as this site ...zotlabs2016-12-302-1/+1
| | * Reorganized and revised Zot Protocol content. Deleted some of the old pages t...Andrew Manning2016-12-3010-479/+368
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-302-2/+20
| |\ | |/ |/|
* | move api version call back to corezotlabs2016-12-301-0/+18
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-3016-805/+1801
|\ \