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
|
191cd21028
|
more perms work
|
2016-07-13 23:05:19 -07:00 |
|
redmatrix
|
b3a785711c
|
deprecate/remove json_decode_plus
|
2016-07-13 22:11:06 -07:00 |
|
redmatrix
|
1fd65c934d
|
lots more permission work
|
2016-07-13 19:53:28 -07: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 |
|
redmatrix
|
b72720f6b6
|
Merge branch 'dev' into perms
|
2016-07-13 18:24:45 -07:00 |
|
redmatrix
|
f60a0c5ce0
|
document mod_acl a bit better and try to remove some redundancies and consolidate the various options
|
2016-07-13 17:51:19 -07: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
|
f4e4e734de
|
more work on perms
|
2016-07-12 21:47:24 -07:00 |
|
redmatrix
|
6424bac47c
|
Merge branch 'dev' into perms
|
2016-07-12 20:50:27 -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
|
ed0e2b52d7
|
move permissiondescription class to zotlabs/lib
|
2016-07-11 21:46:16 -07:00 |
|
redmatrix
|
a01baab4f0
|
Merge branch 'dev' into perms
|
2016-07-11 17:45:10 -07:00 |
|
redmatrix
|
71b001fdb7
|
more perms work - notably the stuff in public_perms
|
2016-07-11 17:02:49 -07:00 |
|
redmatrix
|
67c60229ca
|
use the profile_uid here.
|
2016-07-11 13:20:12 -07:00 |
|
Mario Vavti
|
3d3584b36c
|
remove check for mcrypt
|
2016-07-10 13:42:04 +02:00 |
|
redmatrix
|
c9db8c6857
|
more permissions work
|
2016-07-09 21:08:02 -07:00 |
|
redmatrix
|
917a465ccd
|
more work on perms
|
2016-07-09 19:03:29 -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
|
227320f6f0
|
more fixes for /cloud and /dav
|
2016-07-07 20:16:27 +02: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
|
e6224898d2
|
more heavy lifting on xtensible perms
|
2016-07-04 21:33:25 -07:00 |
|
redmatrix
|
d566ffa678
|
more heavy lifting on extensible perms
|
2016-07-04 17:55:13 -07:00 |
|
redmatrix
|
2a26b0ae91
|
perms work - settings page
|
2016-07-03 22:47:46 -07: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
|
7371e08625
|
ditch the change_view widget and make header fixed in fullscreen mode
|
2016-07-01 12:21:19 +02:00 |
|
redmatrix
|
bb5ec8cfb8
|
allow multiple apd's per plugin dir
|
2016-07-01 02:16:23 -07:00 |
|
redmatrix
|
bd403276f2
|
disable wiki if feature disabled, sync updates of delayed publish posts
|
2016-06-30 21:27:59 -07: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
|
1cc816f662
|
dreport: convert timestamp to channel localtime and get rid of old pre-template code
|
2016-06-29 22:53:18 -07:00 |
|
redmatrix
|
bfe84a9ff7
|
templatise the Dreport page and add a redeliver option for when things stuff up badly.
|
2016-06-29 22:46:47 -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
|
f098600c41
|
missing backslash leads to wsod on refresh permissions
|
2016-06-29 23:04:34 +02:00 |
|
redmatrix
|
715b1667d9
|
readability
|
2016-06-28 20:48:43 -07:00 |
|