Andrew Manning
|
99f7dd0fd4
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-20 05:38:19 -04:00 |
|
redmatrix
|
f4b658d7b1
|
issue #411
|
2016-07-19 05:13:18 -07:00 |
|
Mario Vavti
|
f44ca74e99
|
do not transform hashes to tags in [code=xxx] or [code] blocks
|
2016-07-18 13:48:09 +02:00 |
|
Andrew Manning
|
d6b28cdc57
|
Importing webpage elements from manually entered cloud file path work. All detected elements are automatically imported.
|
2016-07-17 16:05:26 -04:00 |
|
Andrew Manning
|
6c5086a933
|
Added functions to check cloud files path and return path with hashed names
|
2016-07-17 11:52:21 -04:00 |
|
Andrew Manning
|
99354ac576
|
Merge remote-tracking branch 'upstream/dev' into website-import-remote
|
2016-07-16 21:04:04 -04:00 |
|
Andrew Manning
|
e7b8531751
|
Stash changes to merge from dev
|
2016-07-16 21:02:13 -04:00 |
|
Andrew Manning
|
ff2f599142
|
Postpone remote folder import until filesystem mirroring matures.
|
2016-07-16 19:25:44 -04:00 |
|
redmatrix
|
7ee7f00bf3
|
Here's the basic UI for the Zot Access Tokens, requires some minor cleanup
|
2016-07-14 22:41:53 -07:00 |
|
redmatrix
|
397a23499d
|
make the xchan_hash for the access token location independent
|
2016-07-14 21:28:17 -07:00 |
|
redmatrix
|
f3eb9af046
|
more ZAT work
|
2016-07-14 19:43:47 -07:00 |
|
Andrew Manning
|
0edf248cd1
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-14 22:25:30 -04:00 |
|
Andrew Manning
|
514ffb74aa
|
Refactored the scan and import functions to reduce redundant code and simplify logic. Import of pages, layouts, and blocks works.
|
2016-07-14 22:24:23 -04:00 |
|
redmatrix
|
e6c8614801
|
first cut at zot access tokens
|
2016-07-14 19:24:15 -07:00 |
|
redmatrix
|
00afe56cad
|
let abconfig specify a family
|
2016-07-13 20:17:40 -07:00 |
|
Andrew Manning
|
75b943b98a
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-13 05:50:31 -04:00 |
|
redmatrix
|
bdd7d24ac1
|
update_remote_id - updated to work with iconfig
|
2016-07-12 19:08:36 -07:00 |
|
Andrew Manning
|
5131759823
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-12 21:43:05 -04:00 |
|
redmatrix
|
0fa807e7ad
|
don't try to send sync packets to dead sites.
|
2016-07-12 18:38:39 -07:00 |
|
redmatrix
|
ed0e2b52d7
|
move permissiondescription class to zotlabs/lib
|
2016-07-11 21:46:16 -07:00 |
|
redmatrix
|
168d35747d
|
use the get_hostname function rather than parse the url
|
2016-07-11 18:59:54 -07:00 |
|
redmatrix
|
833de9180e
|
create change_channel hook
|
2016-07-11 13:46:06 -07:00 |
|
Andrew Manning
|
c5e534c0cb
|
Clearer import control interface
|
2016-07-10 07:21:52 -04:00 |
|
Andrew Manning
|
a338a97d5b
|
First draft of website import tools
|
2016-07-10 06:58:20 -04:00 |
|
redmatrix
|
ce5adbf51e
|
more sql fine tuning
|
2016-07-09 18:10:13 -07:00 |
|
redmatrix
|
e2574cf069
|
some work on the forum widget queries
|
2016-07-09 16:07:53 -07:00 |
|
redmatrix
|
3bee6543fb
|
reduce the memory usage of the expire query dramatically.
|
2016-07-06 22:19:05 -07:00 |
|
redmatrix
|
581a3c5323
|
expire crashing on shared hosting from memory exhaustion. Lower the expire limit. Also the sys channel was being expired with everybody else due to a flag change regression.
|
2016-07-06 22:02:06 -07:00 |
|
redmatrix
|
ad954d01de
|
unused file
|
2016-07-05 17:57:36 -07:00 |
|
redmatrix
|
e3d70e6b62
|
merge include/reddav.php into Zotlabs/Storage/Directory.php
|
2016-07-05 17:54:05 -07:00 |
|
redmatrix
|
cbf009a95d
|
cleanup
|
2016-07-05 16:56:40 -07:00 |
|
redmatrix
|
35cc763a92
|
regression - save bookmarks no longer present in item menu
|
2016-07-05 16:24:45 -07:00 |
|
Treer
|
5c062aaec4
|
force immediate avatar update
|
2016-07-03 22:38:05 +10:00 |
|
redmatrix
|
523e7b5084
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-01 20:48:49 -07:00 |
|
redmatrix
|
41fa2d6c69
|
delivery invoked twice in mod_tagger, once in post_activity_item() and another at the main module level
|
2016-07-01 20:46:57 -07:00 |
|
redmatrix
|
5947467339
|
use small photo for Diaspora attribution correction; the medium looks awkward in the D* stream.
|
2016-07-01 20:34:00 -07:00 |
|
Mario Vavti
|
7371e08625
|
ditch the change_view widget and make header fixed in fullscreen mode
|
2016-07-01 12:21:19 +02:00 |
|
redmatrix
|
7f8dcf4f12
|
sync flags even if post has not been edited
|
2016-06-30 21:12:39 -07:00 |
|
Andrew Manning
|
0fd8eeec23
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-30 21:51:33 -04:00 |
|
Andrew Manning
|
7124c0aee5
|
Replace homemade table of content generator with existing jQuery plugin. Now toc is linked to document headings.
|
2016-06-30 21:50:38 -04:00 |
|
redmatrix
|
339e620738
|
wiki featured disabled by default in UNO.
|
2016-06-29 21:03:53 -07:00 |
|
redmatrix
|
9ef710c557
|
provide wiki as a feature (default is on so there aren't any surprises) and add to channel menu and profile tabs
|
2016-06-29 20:59:00 -07:00 |
|
redmatrix
|
2e93a09d83
|
stream large photos through buffered I/O if possible
|
2016-06-29 17:31:48 -07:00 |
|
Mario Vavti
|
3102440d40
|
Merge branch 'dev' into sabre32
|
2016-06-29 09:11:22 +02: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
|
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
|
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 |
|
Mario Vavti
|
5b9cd0af64
|
Merge branch 'dev' into sabre32
|
2016-06-27 09:54:01 +02:00 |
|