aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-253-17/+18
|\
| * crc32 is potentially reversiblezotlabs2018-06-251-1/+1
| |
| * SECURITY: logging: hash the session_id in case somebody posts log snippets ↵zotlabs2018-06-251-3/+10
| | | | | | | | from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events
| * remove the white-space pre-wrap property on code blocks. This should ↵zotlabs2018-06-242-9/+2
| | | | | | | | probably be done with the word-break property instead
| * remote_self wasn't working correctlyzotlabs2018-06-241-5/+6
| |
* | versionMario Vavti2018-06-251-1/+1
| |
* | 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
| |\ \ | | | | | | | | | | | | | | | | 2 times the same ;) See merge request hubzilla/core!1222
| | * | Update roadmap.bbgia vec2018-06-191-2/+1
| | |/
| * | Merge branch 'patch-1' into 'dev'Mike Macgirvin2018-06-202-2/+2
| |\ \ | | |/ | |/| | | | | | | NL strings: fix simple error See merge request hubzilla/core!1221
| | * 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
| | | | | | | | | | | | the Friendica remote_self setting
| * | translate dos line endingszotlabs2018-06-1817-2381/+2381
| | |
| * | provide flag to collect_recipients to exclude privacy groups (for federation ↵zotlabs2018-06-181-2/+8
| | | | | | | | | | | | plugin use)
| * | consolidate the various project roadmap files and remove stuff that's either ↵zotlabs2018-06-173-89/+13
| | | | | | | | | | | | finished or abandoned
| * | 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 ↵zotlabs2018-06-171-1/+1
| | | | | | | | | | | | file (doc/doc/es-es)
| * | 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 ↵zotlabs2018-06-171-1/+8
| | | | | | | | | | | | introduced during Apache mod_rewrite with QSA flag)
| * | 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 ↵zotlabs2018-06-155-10/+10
| | | | | | | | updates
| * hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider ↵zotlabs2018-06-152-6/+8
| | | | | | | | saved default changes
| * 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
| | |\ | | | | | | | | | | | | | | | | change repo links See merge request hubzilla/core!1220
| | | * Update README.mdgia vec2018-06-141-1/+1
| | | | | | | | | | | | (cherry picked from commit 7d73543b84507b74c8058da7dd062d7949c34d61)
| | | * Update hubzilla-setup.shgia vec2018-06-141-1/+1
| | |/ | | | | | | (cherry picked from commit 95f2eb68ca38976b7ca9d3f5c2d89c923d5ef4b5)
| * | optionally report total available space when uploadingzotlabs2018-06-133-1/+9
| | |
| * | SECURITY: provide option to disable the cloud 'root' directory and make the ↵zotlabs2018-06-133-0/+15
| |/ | | | | | | cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional.
| * 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 repository See merge request hubzilla/core!1216
| | | * 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/es See merge request hubzilla/core!1214
| | | * | 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
|/ / /