Commit graph

17105 commits

Author SHA1 Message Date
redmatrix
2e93a09d83 stream large photos through buffered I/O if possible 2016-06-29 17:31:48 -07:00
hubzilla
05aba0b4dd Merge pull request #444 from git-marijus/dev
Merge branch sabre32 into dev
2016-06-30 09:34:22 +10:00
Mario Vavti
f098600c41 missing backslash leads to wsod on refresh permissions 2016-06-29 23:04:34 +02:00
Mario Vavti
3102440d40 Merge branch 'dev' into sabre32 2016-06-29 09:11:22 +02:00
redmatrix
715b1667d9 readability 2016-06-28 20:48:43 -07:00
redmatrix
7d62e087c6 identity_export_year() was a bit short-sighted. We really require arbitrary date ranges. A new function was created to tackle this - channel_export_items() which takes a channel, and a start and finish date. Finish date will default to "now" if not set. Will be working this into the interface under a module named "export_items" which will correspond closely to the existing "import_items" module you'll need to do the reverse operation. Will also make it available via the API. Once that is complete, I anticipate removing identity_export_year() as it will then be somewhat redundant, and modifying the documentation on the channel export page accordingly. Note: the function works strictly in GMT so an interface would need to convert from channel local time. 2016-06-28 13:36:48 -07:00
Mario Vavti
dcc65bbacb update to sabre/dav to version 3.2.0 2016-06-28 21:45:14 +02:00
Mario Vavti
feaad50b6c Merge branch 'dev' into sabre32 2016-06-28 13:45:00 +02:00
Mario Vavti
7b2d54dffa fix month view in fullscreen mode 2016-06-28 13:44:32 +02:00
Mario Vavti
e170217c33 erge branch 'dev' into sabre32 2016-06-28 11:57:03 +02:00
Mario Vavti
aff58934c0 update fullcalendar to version 2.8.0 2016-06-28 11:56:28 +02:00
Mario Vavti
9f576369a9 Merge branch 'dev' into sabre32 2016-06-28 11:09:22 +02:00
redmatrix
7d7f43c205 still working through some issues with curl magic-auth
fixed profile photo upload
2016-06-27 22:25:37 -07:00
redmatrix
30a5fe3061 provide a daemon for implementing zot magic-auth over curl. 2016-06-27 19:53:35 -07:00
redmatrix
b155e93ab1 add letsencrypt x3 intermediate cert and new cert file, improve UX of new registrations 2016-06-27 19:04:00 -07:00
redmatrix
3704ff57cb replace [+] and [-] with chevron icons 2016-06-27 16:50:06 -07:00
redmatrix
ee1d527497 comment on the setup page about the possible need for intermediate certs. 2016-06-27 16:15:47 -07:00
Habeas Codice
f40f7b4d6e typos 2016-06-27 16:06:09 -07:00
Mario Vavti
911510f999 Merge branch 'dev' into sabre32 2016-06-27 22:14:42 +02:00
redmatrix
fe7020e2f8 start on re-write of the permissions doc. Some of this will change (slightly), as the permissions framework is currently evolving. Most of the concepts and mechanisms will remain the same, but we need to simplify and do a better job of explaining the concepts. 2016-06-27 05:18:35 -07:00
Mario Vavti
5b9cd0af64 Merge branch 'dev' into sabre32 2016-06-27 09:54:01 +02:00
redmatrix
8d298d5a06 fix for the rendering side of issue #412. We traditionally store all
"user generated" content with ENT_COMPAT encoding to reduce the attack
vector for JS CSS exploits. This may present compatibility issues sharing
wikis to platforms which do not provide such CSS protection. We can either
decide that wikis are inherently insecure and filter them on render (with
an associated performance penalty), or keep the existing method of filtering
on store. I'm not making that choice. I'm merely fixing the obvious rendering
issue in mono-platform viewing.
2016-06-26 22:26:45 -07:00
redmatrix
3035c792dc remove the app $a passed to profile_load, also add profile_load to mod_wiki which should fix issue #431 2016-06-26 22:13:59 -07:00
redmatrix
2029b2b9ed document the daemon classes 2016-06-26 21:58:09 -07:00
redmatrix
900d8f3b0a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-06-26 20:17:12 -07:00
redmatrix
e2de2f65d5 issue #442, tables contain too much whitespace (there's a definite issue here, but I should note the offending example was full of carriage returns as well as linefeeds; which exacerbated the problem). 2016-06-26 20:15:42 -07:00
Mario Vavti
27ee95106d Merge branch 'dev' into sabre32 2016-06-26 08:59:58 +02:00
hubzilla
dac3138fd1 Merge pull request #441 from Treer/cdn
fix absolute .js urls
2016-06-26 13:43:07 +10:00
Treer
e0a7637626 fix absolute .js urls 2016-06-26 13:08:40 +10:00
hubzilla
8c4481733f Merge pull request #438 from anaqreon/wiki
Wiki post generation option and image embed tool
2016-06-26 08:25:31 +10:00
hubzilla
d20e62dcd3 Merge pull request #440 from Treer/misc
fix help link
2016-06-26 08:25:06 +10:00
hubzilla
7805a3c527 Merge pull request #439 from Treer/cdn
Allow absolute links to css and js files (for CDN links)
2016-06-26 08:22:16 +10:00
Andrew Manning
0df3978cc5 A page name wrapped in double brackets is converted into a link to another page in the current wiki 2016-06-25 14:29:52 -05:00
Treer
bd4a88cd3e fix help link 2016-06-26 03:17:10 +10:00
Treer
2dc1236dca Allow absolute links to css and js files 2016-06-25 22:38:15 +10:00
Mario Vavti
2528d97f52 Merge branch 'dev' into sabre32 2016-06-25 13:58:24 +02:00
Andrew Manning
241b257556 Insert image links wherever cursor is in the editor 2016-06-25 06:50:24 -05:00
Andrew Manning
83a42afddf Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-25 06:30:15 -05:00
Andrew Manning
780f83a118 Post generation about new wiki is optional, default is NOT to post. Fixed bug in wiki creation. Added embed image dialog and album browser. 2016-06-25 06:27:14 -05:00
Alexandre Hannud Abdo
ec3651d216 Improvements to help pages 2016-06-25 04:13:29 -07:00
redmatrix
f66576f366 media (e.g. video) files weren't being detected correctly in oembed, causing the stream to try and load large videos (and failing) 2016-06-25 04:09:07 -07:00
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