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 |
|
Andrew Manning
|
960e9edff5
|
Blocks, pages, and layouts import from zip file. Layouts are not applied to pages until imported twice though.
|
2016-07-13 21:46:59 -04:00 |
|
Andrew Manning
|
ba903e21ed
|
Updated import_blocks for database calls
|
2016-07-13 06:17:12 -04:00 |
|
Andrew Manning
|
75b943b98a
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-13 05:50:31 -04:00 |
|
redmatrix
|
18565600b2
|
missing namespace prefix \
|
2016-07-12 22:58:12 -07: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 |
|
Andrew Manning
|
1e4ef81244
|
Import blocks from zip file, but needs updates as detailed in https://gitlab.com/zot/hubsites/merge_requests/2
|
2016-07-12 21:41:37 -04:00 |
|
redmatrix
|
0fa807e7ad
|
don't try to send sync packets to dead sites.
|
2016-07-12 18:38:39 -07:00 |
|
redmatrix
|
b6987b4287
|
the abconfig defaults weren't changed in the schema files when they were changed in the code
|
2016-07-12 13:15:20 -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
|
17c3e12eab
|
document the new change_channel hook
|
2016-07-11 17:43:10 -07:00 |
|
redmatrix
|
833de9180e
|
create change_channel hook
|
2016-07-11 13:46:06 -07:00 |
|
redmatrix
|
fb36561a68
|
force non-null sess_data
|
2016-07-11 13:27:44 -07:00 |
|
redmatrix
|
67c60229ca
|
use the profile_uid here.
|
2016-07-11 13:20:12 -07:00 |
|
redmatrix
|
f4bcb82041
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-11 13:19:13 -07:00 |
|
Mario Vavti
|
a849dcadb6
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-07-11 12:50:12 +02:00 |
|
Mario Vavti
|
d5afd0d7c2
|
do not use visibility for fullscreen button and move fullscreen button to the right
|
2016-07-11 12:49:53 +02:00 |
|
hubzilla
|
ba5183b244
|
Merge pull request #451 from git-marijus/dev
remove check for mcrypt
|
2016-07-11 09:06:11 +10:00 |
|
Mario Vavti
|
3d3584b36c
|
remove check for mcrypt
|
2016-07-10 13:42:04 +02: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 |
|
Mario Vavti
|
e11219888d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-07-10 11:34:10 +02:00 |
|
redmatrix
|
ce5adbf51e
|
more sql fine tuning
|
2016-07-09 18:10:13 -07:00 |
|
Andrew Manning
|
50e581d88a
|
Set max-width for embedded images
|
2016-07-09 20:24:16 -04:00 |
|
Andrew Manning
|
47d7fc70e8
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-07-09 20:17:20 -04:00 |
|
redmatrix
|
e2574cf069
|
some work on the forum widget queries
|
2016-07-09 16:07:53 -07:00 |
|
redmatrix
|
ee1ec0428b
|
gak one more typo
|
2016-07-07 18:53:09 -07:00 |
|
redmatrix
|
3b17dca252
|
typo
|
2016-07-07 18:51:56 -07:00 |
|
redmatrix
|
eef40cb3fd
|
duplicate supression SQL query was horribly inefficient and could cause issues in resource deprived environments.
|
2016-07-07 18:47:18 -07:00 |
|
hubzilla
|
9f413ed174
|
Merge pull request #450 from git-marijus/dev
fix /cloud after recent changes
|
2016-07-08 10:40:59 +10:00 |
|
redmatrix
|
233cfc29d6
|
hide the redeliver option one level down since it should rarely be needed by folks outside of shared hosting.
|
2016-07-07 17:23:52 -07:00 |
|
Mario Vavti
|
0b2ad9deca
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-07-07 20:39:52 +02:00 |
|
Mario Vavti
|
227320f6f0
|
more fixes for /cloud and /dav
|
2016-07-07 20:16:27 +02: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 |
|
Mario Vavti
|
a59e84cadd
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-07-06 21:31:17 +02:00 |
|
Mario Vavti
|
d4627a0b1c
|
fix /cloud after recent changes
|
2016-07-06 21:31:05 +02: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 |
|
hubzilla
|
f46eecc1e7
|
Merge pull request #448 from Treer/avatars
Force local cache update when user changes their profile picture
|
2016-07-04 06:38:49 +10:00 |
|
Treer
|
5c062aaec4
|
force immediate avatar update
|
2016-07-03 22:38:05 +10:00 |
|
Treer
|
b87106b6fe
|
Mark nickname as required field, if left empty then channel creation fails silently
|
2016-07-03 17:59:44 +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
|
0a11991340
|
use visibility instead of display to hide elements
|
2016-07-01 12:58:15 +02:00 |
|