aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-01-112-3/+5
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-113-4/+7
| |\
| * | expires lost during editzotlabs2017-01-112-3/+5
* | | comment out redundant querysMario Vavti2017-01-112-4/+11
| |/ |/|
* | fix embedimage if an albumname contains quotesMario Vavti2017-01-113-4/+7
|/
* btlogger trace file logging not working as desired.zotlabs2017-01-101-4/+7
* normalise feed idzotlabs2017-01-101-9/+16
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-10546-2350/+113029
|\
| * font awesome 4.7.0Mario Vavti2017-01-10545-2093/+112780
| * /connedit do not show vcard and section selector if not yet approved. whitesp...Mario Vavti2017-01-101-257/+249
* | add gravizot.de to directory server fallbackszotlabs2017-01-101-1/+2
* | obj_type on edit activity was wrongzotlabs2017-01-092-3/+3
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-094-4490/+4604
|\
| * implement a menu to select a section to be open by defaultMario Vavti2017-01-092-9/+37
| * Merge pull request #640 from mjfriaza/devzotlabs2017-01-092-4481/+4567
| |\
| | * Updated the Spanish translationManuel Jiménez Friaza2017-01-072-4481/+4567
* | | channel move stuff (disabled currently because not yet complete)zotlabs2017-01-095-8/+34
|/ /
* | Comanche: add greater/less than (plus greater/less than or equal) conditionalszotlabs2017-01-071-1/+31
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 17:47:17 +0000