aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
|\ \ \
* | | | logger typoszotlabs2016-12-301-2/+2
| | * | css fixes and get rid of a javascript workaroundMario Vavti2016-12-303-11/+3
| |/ /
| * | update fullcalendar to version 3.1Mario Vavti2016-12-3010-724/+1461
| * | Merge pull request #633 from anaqreon/devzotlabs2016-12-293-109/+102
| |\ \
| | * \ Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2016-12-280-0/+0
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #632 from anaqreon/devzotlabs2016-12-292-48/+113
| |\ \ \
| | | * | Split Zot protocol and API into two pages. Revise text to add detail and impr...Andrew Manning2016-12-283-109/+102
| | |/ /
| | * / Zot structures doco integrated into the Zot page. Added nowrap option to [cod...Andrew Manning2016-12-282-48/+113
| |/ /
| * | Merge pull request #631 from anaqreon/devzotlabs2016-12-283-3/+204
|/| |
| * | Add webpage doco to Member guide. Add nav menu highlighting when scrolling pa...Andrew Manning2016-12-273-3/+204
|/ /
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-272-112/+190
|\ \
| * \ Merge pull request #630 from anaqreon/devAndrew Manning2016-12-272-112/+190
| |\ \
| | * | Revert parseIdentityAwareHTML()Andrew Manning2016-12-271-1/+1