Mario Vavti
c8ae04a96a
Merge branch 'dev' into sabre32
2016-06-24 11:25:20 +02:00
redmatrix
c809b6f95e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-06-24 02:18:26 -07:00
redmatrix
fb93ae2128
fix pdledit "list layouts"
2016-06-24 02:07:12 -07:00
hubzilla
25c9e9ef93
Merge pull request #435 from dissolve/microformats2
...
add url permalink mf2 markup
2016-06-24 14:55:56 +10:00
Ben Roberts
812dc9e898
add url permalink mf2 markup
2016-06-24 00:45:39 -04:00
hubzilla
bf4b698573
Merge pull request #434 from dissolve/microformats2
...
p-author missing from embedded h-card in items
2016-06-24 13:58:01 +10:00
Ben Roberts
5162c55e5d
p-author missing from embedded h-card in items
2016-06-23 23:46:02 -04:00
redmatrix
096619dbbe
make dropdown-caret invoke the dropdown
2016-06-23 20:13:20 -07:00
redmatrix
fa02a09107
SuperCurl to provide a re-usable curl options stack and just change options that are different from one call to the next
2016-06-23 20:05:57 -07:00
redmatrix
51e2ef39c2
db update for abconfig transition
2016-06-23 18:35:01 -07:00
redmatrix
b19bbf5473
change AbConfig to use channel_id instead of channel_hash; which was a mistake in retrospect
2016-06-23 18:12:26 -07:00
redmatrix
e5c66d94f2
relocate the cache class
2016-06-23 05:18:58 -07:00
redmatrix
2a32713dfc
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-06-23 01:18:17 -07:00
redmatrix
acf26d5c63
code cleanup for profile_photos
2016-06-23 01:17:44 -07:00
Mario Vavti
39b14b6b81
Merge branch 'dev' into sabre32
2016-06-23 10:14:13 +02:00
hubzilla
ac81a3a5ef
Merge pull request #433 from dissolve/microformats2
...
microformats 2 for posts
2016-06-23 14:39:26 +10:00
Ben Roberts
ab628eb2a3
microformats 2 for posts
2016-06-22 23:59:27 -04:00
redmatrix
b8c5a91940
set profile when "use existing photo"
2016-06-22 20:46:44 -07:00
redmatrix
515b054a6e
missing class selector when "use photo as profile photo"
2016-06-22 20:17:19 -07:00
redmatrix
cef77ce5bb
the xchan_query wasn't fully optimised as we were comparing quoted and unquoted strings when looking for duplicates
2016-06-22 19:22:59 -07:00
redmatrix
1267d995ef
db statement debugging
2016-06-22 19:08:59 -07:00
redmatrix
ec8091a102
use the normal html escape for '@' in addresses rather than the high-plane unicode variant. This makes it copy-able, but not easily scrape-able.
2016-06-22 18:00:18 -07:00
Mario Vavti
5536df51f5
erge branch 'dev' into sabre32
2016-06-22 09:58:55 +02:00
redmatrix
f48b12ff52
provide a skeleton of the current CalDAVClient with lots of notes about how best to move forward just in case anybody is feeling ambitious or anxious.
2016-06-21 20:44:55 -07:00
redmatrix
415a8d1e01
channel homepage not providing content when javascript disabled
2016-06-21 19:42:08 -07:00
redmatrix
2a840460dd
vcard spec changes
2016-06-21 19:25:14 -07:00
redmatrix
12f114c4be
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-06-21 18:26:16 -07:00
redmatrix
b593c3a9b9
1. provide automatic relocation of important links in items that are imported or synced to clones
...
2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O.
3. item_store and item_store_update now return the item that was stored
2016-06-21 18:24:36 -07:00
redmatrix
8fa26db1b3
1. provide automatic relocation of important links in items that are imported or synced to clones
...
2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O.
2016-06-21 18:18:06 -07:00
Mario Vavti
ecae0b3d97
Merge branch 'dev' into sabre32
2016-06-21 10:08:49 +02:00
redmatrix
63423c8ee1
make sure the optimisations are reliable
2016-06-20 20:56:58 -07:00
redmatrix
ed16660867
code optimisation
2016-06-20 20:34:19 -07:00
redmatrix
9c9d6363af
update attach on import if exists
2016-06-20 19:39:12 -07:00
redmatrix
3a43b1d85d
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-06-20 13:43:36 -07:00
redmatrix
01bfadaeaa
fix siteinfo plugin list
2016-06-20 13:42:04 -07:00
hubzilla
670d12219b
Merge pull request #429 from anaqreon/wiki
...
Wiki page revision comparison viewer
2016-06-21 06:23:58 +10:00
Mario Vavti
da2c0a22f9
Merge branch 'dev' into sabre32
2016-06-20 22:05:03 +02:00
Mario Vavti
953ac6f3c7
last merge from master did reset the std_version to 1.8 - set it back to 1.9 for dev
2016-06-20 22:03:39 +02:00
Mario Vavti
545219b839
Merge branch 'dev' into sabre32
2016-06-20 21:47:49 +02:00
Mario Vavti
985fb44424
Merge branch 'master' into dev
2016-06-20 21:46:33 +02:00
Mario Vavti
17c5502330
missing backslash leading to wsod on xconfig changes
2016-06-20 21:45:15 +02:00
Andrew Manning
aa88837a31
Merge branch 'dev' into wiki
2016-06-20 13:28:50 -04:00
Andrew Manning
a3ec9f3940
Add formatted heading for revision comparison viewer
2016-06-20 13:27:05 -04:00
Andrew Manning
8cd9a1e4fc
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-20 13:07:29 -04:00
Andrew Manning
f4d9d34bbc
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-06-20 13:06:32 -04:00
Andrew Manning
20b4fc9198
Do not change active page commit until user reverts the page
2016-06-20 13:05:18 -04:00
Mario Vavti
e40112b40d
Merge branch 'dev' into sabre32
2016-06-20 09:31:27 +02:00
redmatrix
cc09f9a7a5
Added many of the recent schema changes to the database schema documentation
2016-06-19 22:50:41 -07:00
redmatrix
4b505948f0
update the bbcode doc
2016-06-19 22:04:08 -07:00
redmatrix
3cf6f1f79c
merge conflict
2016-06-19 21:47:04 -07:00