aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-06-2554-3015/+2447
|\
| * Merge branch 'dev' into 'dev'Mike Macgirvin2018-06-201-2/+1
| |\
| | * Update roadmap.bbgia vec2018-06-191-2/+1
| * | Merge branch 'patch-1' into 'dev'Mike Macgirvin2018-06-202-2/+2
| |\ \ | | |/ | |/|
| | * fix simple errorjeroenpraat2018-06-181-1/+1
| | * fix simple errorjeroenpraat2018-06-181-1/+1
| * | hiding a channel from the directory also hides them from the cloud rootdirzotlabs2018-06-181-3/+2
| * | whitespacezotlabs2018-06-181-2/+0
| * | channel sources: add 'resend' option to discard original author - similar to ...zotlabs2018-06-183-6/+13
| * | translate dos line endingszotlabs2018-06-1817-2381/+2381
| * | provide flag to collect_recipients to exclude privacy groups (for federation ...zotlabs2018-06-181-2/+8
| * | consolidate the various project roadmap files and remove stuff that's either ...zotlabs2018-06-173-89/+13
| * | remove admin docs on upgrading from redmatrix; operation is no longer supportedzotlabs2018-06-171-10/+0
| * | This effectively reverts 438ce44a which symlinked doc/es to a non-existent fi...zotlabs2018-06-171-1/+1
| * | remove several unused/unreferenced templateszotlabs2018-06-1724-511/+12
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-06-1711-171/+181
| |\|
| * | owa: htmlentity encoding encountered in authentication workflow (possibly int...zotlabs2018-06-171-1/+8
| * | slightly more memory efficient way to drop posts of removed connectionszotlabs2018-06-151-7/+8
* | | updates justified gallery lib to version 3.7 and minor fixes for full templateMario Vavti2018-06-255-210/+338
| |/ |/|
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-06-1729-73/+116
|\|
| * apply changes to slider defaults across all modules that use buildQuery for u...zotlabs2018-06-155-10/+10
| * hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider ...zotlabs2018-06-152-6/+8
| * wiki: word-wrap code on any characterzotlabs2018-06-141-0/+2
| * re-implement/refactor getQuotaInfo() on DAV storagezotlabs2018-06-144-37/+50
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-06-132-2/+2
| |\
| | * Merge branch 'dev' into 'dev'Mike Macgirvin2018-06-142-2/+2
| | |\
| | | * Update README.mdgia vec2018-06-141-1/+1
| | | * Update hubzilla-setup.shgia vec2018-06-141-1/+1
| | |/
| * | optionally report total available space when uploadingzotlabs2018-06-133-1/+9
| * | SECURITY: provide option to disable the cloud 'root' directory and make the c...zotlabs2018-06-133-0/+15
| |/
| * uid is integerzotlabs2018-06-131-1/+1
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2018-06-136-8/+8
| |\
| | * Merge branch 'fix-addons-links' into 'dev'Mike Macgirvin2018-06-136-8/+8
| | |\
| | | * fix links to addons repositoryHerbert Thielen2018-06-116-8/+8
| | |/
| * | Merge branch 'master' of ../hz into devzotlabs2018-06-131-1/+1
| |\ \ | | |/ | |/|
| | * null db fields in mod_invitezotlabs2018-06-131-1/+1
| * | Merge branch 'master' of ../hz into devzotlabs2018-06-104-5/+8
| |\|
| | * hubzilla core issue #1218zotlabs2018-06-102-1/+6
| | * fixes for immediate expire, channel_active not initialised in DBzotlabs2018-06-102-4/+2
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-06-101-1/+1
| |\ \
| | * \ Merge branch 'dev' into 'dev'Mario2018-06-101-1/+1
| | |\ \
| | | * | Update symbolic link doc/esManuel Jiménez Friaza2018-06-091-1/+1
| * | | | fix issue #1221Mario Vavti2018-06-101-2/+2
| |/ / /
* / / / some work on mod groupMario2018-06-1711-171/+181
|/ / /
* | | fix issue #1219Mario Vavti2018-06-092-4/+7
* | | move cid filter js to the widgetMario Vavti2018-06-092-4/+5
* | | bump versionMario Vavti2018-06-091-1/+1
* | | restrict cid filter to unthreaded order (makes much more sense that way imho ...Mario Vavti2018-06-093-36/+35
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-06-0828-81/+96
|\ \ \
| * \ \ Merge branch 'dev' into 'dev'Mario2018-06-0826-44/+44
| |\ \ \