harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,917 Commits 6 Branches 36 Tags
0fac35686b28825da69c77f9a903e4e24a7036fa
Commit Graph

6948 Commits

Author SHA1 Message Date
Mario Vavti 0fac35686b Merge remote-tracking branch 'mike/master' into dev 2017-09-03 21:49:01 +02:00
Mario Vavti dc18440c18 introduce item_normal_update(). the differnce to item_normal() is that we do not query for item_deleted = 0 and therefor can find deleted likes which allows us to update our unlikes on the fly if static page update is enabled 2017-09-03 21:33:07 +02:00
zotlabs 499b7de0d2 Reviewed. This is OK. 
Revert "may be exploitable in current form - awaiting review"

This reverts commit 7bff60edac.
 2017-09-03 00:59:51 -07:00
Mario Vavti 1a0cf2666a Merge remote-tracking branch 'mike/master' into dev 2017-09-02 23:52:31 +02:00
zotlabs 7bff60edac may be exploitable in current form - awaiting review 2017-09-02 14:04:37 -07:00
Mario Vavti 3af3b36db3 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-09-01 10:41:07 +02:00
git-marijus 9333503600 Merge pull request #850 from anaqreon/doco 
Fix the multiple table of content bug
 2017-09-01 10:40:24 +02:00
zotlabs 5bffae6219 cut down on a few extraneous gprobe processes 2017-08-31 23:21:06 -07:00
zotlabs ae8cdc3b42 some changes after testing server-to-server magic auth 2017-08-31 21:38:03 -07:00
zotlabs b413beeb36 add server-to-server magic auth to dav and cdav controllers 2017-08-31 20:45:13 -07:00
zotlabs 0cf5536e90 server to server magic auth 2017-08-31 20:08:58 -07:00
zotlabs 5e767144c9 simplify api_auth 2017-08-31 19:09:07 -07:00
zotlabs 74f55d1504 check input is hex before sending it to hex2bin 2017-08-30 21:45:54 -07:00
zotlabs be097bf415 issue with mentions and xchans with @ or / 2017-08-30 16:24:26 -07:00
zotlabs 77267e049a use iso 8601 "Zulu" for log timestamps so it can be easily processed with fail2ban 2017-08-29 20:47:49 -07:00
zotlabs e2b6464f83 escape 'http' inside code blocks so it doesn't trigger an oembed 2017-08-29 20:07:26 -07:00
Andrew Manning acacea5efe Merge remote-tracking branch 'upstream/dev' into doco 2017-08-27 23:47:14 +00:00
Andrew Manning 49b38bd71b Merge remote-tracking branch 'upstream/dev' into doco 2017-08-25 11:32:28 +00:00
Andrew Manning 75f3e9202e Removed duplicated table of contents (TOC) in Help pages by breaking hierarchical TOC loading. 2017-08-25 11:32:18 +00:00
zotlabs cff5e360fd Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-08-24 18:50:04 -07:00
zotlabs 5c92337821 cards - change placeholdertext, separate from button text 2017-08-24 18:34:12 -07:00
zotlabs 341386a95b make cards searchable 2017-08-24 18:15:19 -07:00
git-marijus 9cb856d5fd Merge pull request #849 from anaqreon/doco 
Added language selector menu for Help pages
 2017-08-24 21:58:44 +02:00
git-marijus 2d5768b71c ditch discover tab in favour of the public stream app 2017-08-24 21:47:01 +02:00
Andrew Manning 90ec3340e4 Merge remote-tracking branch 'upstream/dev' into doco 2017-08-24 18:57:52 +00:00
Andrew Manning cf2609530f Added language selector menu for Help pages 2017-08-24 18:57:41 +00:00
Mario Vavti cdccf60132 Merge remote-tracking branch 'mike/master' into dev 2017-08-24 20:18:18 +02:00
Andrew Manning 592cf893c0 Fixed incorrect language path when choosing the language from browser preference 2017-08-24 11:19:11 +00:00
zotlabs e157e3bec8 cards: make page load after comment post 2017-08-23 22:06:42 -07:00
zotlabs 4450170790 partial support (unfinished) for ajax loading cards with liveupdate; page still functions even though this isn't finished 2017-08-23 21:26:09 -07:00
zotlabs e778815605 use two keys for the updated sort 2017-08-23 20:12:40 -07:00
zotlabs f2e802229a add new conv_sort option 2017-08-23 20:02:28 -07:00
zotlabs 64cf36a2b5 lognoise: don't log sync packet contents if there are no clones to receive them 2017-08-23 19:25:42 -07:00
zotlabs 3b68df1be6 several card enhancements 2017-08-23 17:46:20 -07:00
zotlabs e084b776ee cards feature 2017-08-23 00:01:02 -07:00
Andrew Manning 6c38857502 Repaired and extended support for help page translations including table of contents files at the top level. Moved help module javascript to mod_help.js. 2017-08-23 03:33:03 +00:00
zotlabs 9f37dbc6dc util/dcp - support recursion and folders full of photos by importing files singly in separate processes - not yet tested 2017-08-22 18:29:51 -07:00
zotlabs 9d5b6858ea stream_perms_xchans wasn't working which has effects in mod_display and there are also issues with the oembed provider for mod_display. This is a first cut for the second but hasn't yet been tested 2017-08-21 02:01:41 -07:00
zotlabs 8a5c23fd50 issue with oembed of a shared item, which wraps in another share. 2017-08-20 17:45:08 -07:00
zotlabs 4111ba8dee php warnings 2017-08-18 03:04:15 -07:00
zotlabs 9b87940ed2 remove easter egg 2017-08-15 18:49:08 -07:00
zotlabs 68f6043d44 new content type 2017-08-14 17:34:47 -07:00
zotlabs 998bd585bb add protocol selection to following feeds 2017-08-12 00:59:05 -07:00
zotlabs 86c4743ed9 deliverable_singleton - also check hubloc_hash in case we don't have an xchan_hash 2017-08-10 21:43:36 -07:00
zotlabs 1408e3da3b prevent uploads to comments if the channel has a default private ACL. 2017-08-10 21:08:07 -07:00
zotlabs 5f6eedcc1a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-08-10 20:34:20 -07:00
zotlabs 7cec3f4dbf include the mastodon summary in the post 2017-08-10 18:05:06 -07:00
zotlabs 6c55e44f4c when following, allow [network]follow_address syntax to connect with a specific network for multi-protocol services 2017-08-10 12:49:20 -07:00
git-marijus 9411732c1b do not show channel manager and nav channel select if we are in a delegate session 2017-08-10 11:41:00 +02:00
Mario Vavti 0a96cdd950 merge red/master into dev 2017-08-10 08:09:02 +02:00