redmatrix
b6a545b4a2
Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev
2016-08-21 16:33:59 -07:00
Mario Vavti
4f62d7a78f
move jotnets to jot and some cleanup (mostly whitespace)
2016-08-21 15:43:03 +02:00
Andrew Manning
1c61e316b4
Block export and re-import works. Fixed bug where layout content was not being imported properly.
2016-08-20 21:08:15 -04:00
Andrew Manning
2d42d58738
Layouts list and are selectable for export to the zip file
2016-08-20 16:05:27 -04:00
Andrew Manning
80ed05d45d
Export of pages and their layouts to a zip file works. Bug on importing the exported zip file for pages.
2016-08-20 15:22:30 -04:00
redmatrix
9fe4bae52f
block backdoor delivery of bulk imported items
2016-08-19 17:12:48 -07:00
Andrew Manning
cf93d9c3b4
Merge remote-tracking branch 'upstream/dev' into website-export
2016-08-19 19:34:04 -04:00
Andrew Manning
40a7d38210
Pages populate the available-to-export list. New checkbox class for smaller boxes.
2016-08-19 19:32:52 -04:00
redmatrix
fa98f4c55d
import anomaly
2016-08-17 19:44:24 -07:00
Andrew Manning
f2e87a204d
Progress implementing zip file export
2016-08-17 21:25:50 -04:00
Andrew Manning
c98b91f514
Stash changes for merge with dev
2016-08-17 18:19:36 -04:00
redmatrix
537401cf27
don't set session theme unless logged in.
2016-08-16 22:15:51 -07:00
redmatrix
b2eede891a
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-08-16 19:01:20 -07:00
redmatrix
a2873c18ca
get rid of ugly code construct
2016-08-16 19:00:38 -07:00
Mario Vavti
291b0edbe0
rename limited -> custom
2016-08-16 08:05:46 +02:00
hubzilla
752bb169ed
Merge pull request #487 from git-marijus/dev
...
implement groups in the acl select.
2016-08-16 06:59:52 +10:00
Mario Vavti
4b101c2240
provide group options serverside and minor cleanup
2016-08-15 22:54:07 +02:00
redmatrix
4facae674d
fix attached photo/file permissions on clones
2016-08-15 13:18:25 -07:00
redmatrix
000861da0d
event_store_event hook
2016-08-14 18:22:18 -07:00
Andrew Manning
6868403383
Context help for settings/features page
2016-08-14 13:34:52 -04:00
Andrew Manning
229cc2ac43
Change text for submenu on small screens to be static toggle statement
2016-08-14 06:55:02 -04:00
Andrew Manning
cb9ac6dd34
Replace hardcoded button title in javascript to translatable text
2016-08-14 06:46:48 -04:00
Andrew Manning
2e7f4c1870
Added a disable comments setting to the "Additional features" settings with a corresponding post editor toggle button
2016-08-14 06:41:12 -04:00
redmatrix
165f442d70
pending flag not being reset when using autoperms from custom role
2016-08-12 18:17:39 -07:00
redmatrix
ebbe18a426
better method of dealing with api versions
2016-08-11 20:09:38 -07:00
redmatrix
6bc5dd75bd
more cleanup of api
2016-08-11 19:42:44 -07:00
redmatrix
0257d660ad
move error processing back inside the function
2016-08-11 18:09:48 -07:00
redmatrix
c63deda71a
embed filter adjustments
2016-08-11 17:33:28 -07:00
redmatrix
3ba4b2c1c1
A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but you have to start somewhere.
2016-08-11 17:02:52 -07:00
redmatrix
e985436b3b
forum detection was off for forums with custom perms
2016-08-10 20:49:51 -07:00
Mario Vavti
82e867a9a8
implement acl for folder creation
2016-08-10 16:17:09 +02:00
redmatrix
5238a27ab3
function order reversed
2016-08-09 20:50:33 -07:00
redmatrix
ec3ca11d0d
bad code format
2016-08-09 16:59:35 -07:00
redmatrix
07dca90352
updates to hcard parsing
2016-08-07 21:00:23 -07:00
redmatrix
3338f3c5b2
diaspora vcard updates
2016-08-07 20:16:14 -07:00
redmatrix
5243dd153b
use config system.server_role and deprecate 'UNO'
2016-08-07 17:29:35 -07:00
Mario Vavti
89c026924b
fix /cloud upload for images
2016-08-06 14:40:23 +02:00
Mario Vavti
4f0b138692
bring back acl for cloud file uploads
2016-08-06 12:46:10 +02:00
Mario Vavti
53a2262fef
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-08-05 12:13:50 +02:00
Andrew Manning
6a82ff871f
Parse bbcode when page loads
2016-08-04 19:45:35 -04:00
Andrew Manning
05a9f0aa14
Convert select bbcode tags including [observer], [baseurl], [sitename]
2016-08-03 20:53:51 -04:00
Mario Vavti
908e15bc90
multi acl: port events
2016-08-03 23:57:41 +02:00
Mario Vavti
b959641ca8
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-08-03 21:17:08 +02:00
Mario Vavti
c50bfa07ca
multiple acl work
2016-08-03 21:16:57 +02:00
redmatrix
c4fd0af16d
comment policy permissions typo
2016-08-02 18:21:43 -07:00
redmatrix
3a7d3e3a54
This checkin should make all permission modes work correctly with atokens (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections.
2016-08-01 20:12:52 -07:00
redmatrix
4c76b31684
/storeurl/cloudurl/
2016-08-01 17:44:21 -07:00
redmatrix
9b9621e10d
add a few more path macros to portable menu elements (channelurl, pageurl, storeurl and baseurl)
2016-07-31 20:14:25 -07:00
redmatrix
86eb923f29
make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, and PERMS_CONTACTS; or everything but PERMS_SPECIFIC. PERMS_SITE could be contentious, but we're currently denying them as they are a guest and don't actually have a channel on this site. We can't easily make PERMS_SPECIFIC work without providing an abook entry for the guest since we would need to set specific permissions for the guest login, but unfortunately this could be the most desirable setting to use in many cases. There is also an update of hmessages.po in this commit.
2016-07-31 18:08:41 -07:00
Andrew Manning
42b718b3e0
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-31 07:38:44 -04:00
Andrew Manning
7c47557554
Improved UI. Removed logger statements.
2016-07-31 07:30:25 -04:00
redmatrix
da9b6690e5
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-07-30 14:04:30 -07:00
Andrew Manning
f17f51a9c1
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-30 06:30:46 -04:00
redmatrix
4ce8f965aa
issue #466 , sql typo
2016-07-28 13:10:19 -07:00
Mario Vavti
9fa3956aa8
translate mime types to icons, update some icons, move file preview (upload progress) below table header
2016-07-28 10:28:48 +02:00
redmatrix
80e4338314
missing s
2016-07-26 19:28:28 -07:00
redmatrix
56957b60e2
issue #460 - remove reference to $a which was passed by value since it doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier.
2016-07-26 15:57:33 -07:00
redmatrix
2fb4952137
issue #460
2016-07-25 13:27:17 -07:00
redmatrix
b5f2b4af35
string update and some minor comment edits
2016-07-24 16:11:34 -07:00
redmatrix
2c1b432613
fix birthday addtocal
2016-07-21 21:35:26 -07:00
redmatrix
bc46f70a90
zat URL auth updated to match changes to the atoken_login interface
2016-07-21 20:04:30 -07:00
Andrew Manning
5a63ddd645
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-21 21:14:54 -04:00
redmatrix
8566f91303
fail oembed if it is attempted and less than 80% of the original content is left after html filtering. For the original poster, this will fall back to linkinfo results. If the embed gets through their site but is filtered downstream (with more than 20% of the content removed), it will result in just a link.
2016-07-21 17:44:04 -07:00
redmatrix
cf0b1f1f15
typo
2016-07-21 01:48:20 -07:00
redmatrix
da707736a0
issue #453 and a bug noted from the logfiles related to the schema change last month
2016-07-20 23:04:07 -07:00
redmatrix
6a56a509d3
Merge branch 'dev' into perms
2016-07-20 19:03:18 -07:00
redmatrix
779885f9af
fix vevent multi-line formatting
2016-07-20 18:59:51 -07:00
redmatrix
3affb2e817
sort out some of the authentication mess - with luck this may fix the DAV auth issue which I simply could not duplicate or find a reason for.
2016-07-20 17:55:40 -07:00
Andrew Manning
99f7dd0fd4
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-20 05:38:19 -04:00
redmatrix
a3e5307b93
fix the forum detection in include/zot
2016-07-19 22:57:23 -07:00
redmatrix
ae6256f95a
another couple of minor perms fixes
2016-07-19 22:32:22 -07:00
redmatrix
a961d5e6c8
permission fixes
2016-07-19 20:49:54 -07:00
redmatrix
237cca7a0d
fixes to perms
2016-07-19 19:33:48 -07:00
redmatrix
ea83032863
translate more old perms calls
2016-07-19 17:52:45 -07:00
redmatrix
6a4573b935
Merge branch 'dev' into perms
2016-07-19 17:05:59 -07:00
redmatrix
f4b658d7b1
issue #411
2016-07-19 05:13:18 -07:00
redmatrix
7272b97e9a
yet more grungy perms work.
2016-07-19 01:26:28 -07:00
redmatrix
99cf2cbaa9
missing bracket
2016-07-18 21:46:40 -07:00
redmatrix
b63165b6e0
more perms work (a lot more)
2016-07-18 21:37:34 -07:00
redmatrix
32ce790717
move legacy code inside the legacy check
2016-07-18 19:09:27 -07:00
redmatrix
b5b57523f1
more perms work
2016-07-18 16:45:43 -07:00
redmatrix
7524948a97
Merge branch 'dev' into perms
2016-07-18 16:10:41 -07:00
redmatrix
f9b67d3630
more perms work
2016-07-18 13:44:39 -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
redmatrix
10fa5c20e7
export/import channel permissions
2016-07-17 22:40:39 -07:00
redmatrix
f7833411a1
clone channel perms
2016-07-17 22:18:35 -07:00
redmatrix
de4f9d68bd
Merge branch 'dev' into perms
2016-07-17 21:40:04 -07: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
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
503b420292
rework perm_is_allowed
2016-07-13 20:23:20 -07:00
redmatrix
0aa205044b
Merge branch 'dev' into perms
2016-07-13 20:19:11 -07:00
redmatrix
00afe56cad
let abconfig specify a family
2016-07-13 20:17:40 -07:00
redmatrix
1fd65c934d
lots more permission work
2016-07-13 19:53:28 -07:00
Andrew Manning
75b943b98a
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-13 05:50:31 -04: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
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
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
833de9180e
create change_channel hook
2016-07-11 13:46:06 -07:00
redmatrix
cc83983ae5
perms work
2016-07-10 17:45:14 -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
e6638b4715
change default so we don't have to check for array existence later
2016-07-09 21:23:00 -07: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
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
537f30f707
Merge branch 'dev' into perms
2016-07-05 19:40:09 -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
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
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
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
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
Andrew Manning
b96edd8b9a
Added table of contents generator. Table is inserted wherever [toc] is encountered.
2016-06-26 15:04:47 -04: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
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
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
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
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
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
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
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
2a840460dd
vcard spec changes
2016-06-21 19:25:14 -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
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
hubzilla
670d12219b
Merge pull request #429 from anaqreon/wiki
...
Wiki page revision comparison viewer
2016-06-21 06:23:58 +10: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
Andrew Manning
8cd9a1e4fc
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-20 13:07:29 -04:00
Mario Vavti
e40112b40d
Merge branch 'dev' into sabre32
2016-06-20 09:31:27 +02:00
redmatrix
fb61c4fb34
Merge branch '1.8RC'
2016-06-19 19:12:33 -07:00
redmatrix
30841d9470
Don't use count() to check DB results
2016-06-19 18:57:56 -07:00
Oda
5b92922516
When picktime is false, close date selector on date select
2016-06-18 23:03:06 -03:00
Mario Vavti
178b440f05
Merge branch 'dev' into sabre32
2016-06-18 11:10:40 +02:00
redmatrix
2e7606f569
the text link to a thing will take you to the local thing page, both as a link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL.
2016-06-17 21:44:08 -07:00
redmatrix
2793086c0d
1. string update, 2. pretty print json blobs
2016-06-17 14:58:03 -07:00
Andrew Manning
80d3a831f3
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-17 06:36:09 -04:00
Andrew Manning
961539258b
Wiki page revision comparison tool with diff displayed in modal dialog. Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode
2016-06-17 06:33:39 -04:00
Mario Vavti
0324bc5cf0
Merge branch 'dev' into sabre32
2016-06-17 10:04:27 +02:00
redmatrix
f6d7628254
core changes to better support media migrations
2016-06-16 20:16:39 -07:00
Mario Vavti
28a7458e48
Merge branch 'dev' into sabre32
2016-06-16 10:26:47 +02:00
redmatrix
a2a87fec54
code comments
2016-06-15 22:36:00 -07:00
redmatrix
d457f11717
custom request methods for curl
2016-06-15 21:25:26 -07:00
redmatrix
bc5f73e6c3
provide a default for undefined languages
2016-06-15 20:51:55 -07:00
redmatrix
1dc35db1fe
ignore case in language names and add 'js' as an alias for 'javascript'
2016-06-15 20:25:19 -07:00
hubzilla
e0b705fd54
Merge pull request #422 from anaqreon/wiki
...
Wiki rename page feature added. Bug fixes related to git commits.
2016-06-16 13:01:49 +10:00
redmatrix
854c23a751
This was the reason for the large line widths - an extra linefeed after each li element
2016-06-15 19:59:30 -07:00
redmatrix
fa48de33c2
provide syntax based [colour] highlighting on code blocks for popular languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins.
2016-06-15 19:44:15 -07:00
Andrew Manning
fc7c4e64ff
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-15 21:48:47 -04:00
Mario Vavti
05ed20d336
Merge branch 'dev' into sabre32
2016-06-15 17:34:03 +02:00
redmatrix
ef1c01d968
add new connection to default group when auto-accepted
2016-06-15 05:30:03 -07:00
redmatrix
47fc0c7958
add new connection to default group when auto-accepted
2016-06-15 05:28:16 -07:00
Andrew Manning
688171d016
Rename page feature added. Fixed bug in git commit function and other minor fixes.
2016-06-15 06:25:31 -04:00
Mario Vavti
5c458e9111
Merge branch 'dev' into sabre32
2016-06-14 09:42:43 +02:00
redmatrix
0ef2622621
some work to provide propagation and honouring of the item_notshown flag.
2016-06-13 22:09:22 -07:00
redmatrix
1ff9abe1b4
missing iconfig conversion
2016-06-13 21:16:36 -07:00
redmatrix
1e68d4fb75
deprecate the item_id table - replace with iconfig. A possibly useful function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication.
2016-06-13 19:58:24 -07:00
Mario Vavti
e963714ad6
Merge branch 'dev' into sabre32
2016-06-13 09:18:39 +02:00
hubzilla
b18b9464a4
Merge pull request #416 from anaqreon/embedphotos
...
Add embed photos button with album browser to new post editor
2016-06-13 10:15:09 +10:00
redmatrix
7abfe716b4
DB schema issue with import
2016-06-12 16:35:17 -07:00
redmatrix
81b3c59711
DB schema issue with import
2016-06-12 16:34:27 -07:00
Andrew Manning
410f5389ae
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
2016-06-12 15:18:43 -07:00
Andrew Manning
a1183bf09a
Merge remote-tracking branch 'upstream/dev' into embedphotos
2016-06-12 14:38:48 -04:00
Andrew Manning
e109abbef7
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
2016-06-12 07:17:23 -04:00
redmatrix
f41380de77
remove debugging
2016-06-11 15:28:52 -07:00
redmatrix
0e0a6f5f8d
Work supporting issue #411 , add an optional priority (int) as a second arg to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other
...
ordering.
2016-06-11 15:23:13 -07:00
Mario Vavti
bdbbe00bdf
Merge branch 'dev' into sabre32
2016-06-11 20:12:41 +02:00
redmatrix
96cd63cf1a
iconfig sharing not set correctly
2016-06-10 22:41:58 -07:00
Mario Vavti
86985b454f
Merge branch 'dev' into sabre32
2016-06-10 12:22:01 +02:00
Andrew Manning
7a242f829f
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-09 20:07:09 -04:00
Andrew Manning
7fc2b13fe6
Stashing changes. Not a functional state.
2016-06-09 20:06:36 -04:00
Mario Vavti
85e82e919e
more style work
2016-06-09 22:05:52 +02:00
redmatrix
40bba93a31
potential fix to hubzilla-addons issue 16
2016-06-08 19:34:11 -07:00
Andrew Manning
9410b63bbc
Revised permissions checks across API and enabled collaborative editing using the write_pages per-channel permission.
2016-06-08 06:26:27 -04:00
Andrew Manning
d43a814385
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-08 05:41:13 -04:00
redmatrix
e46e7002a8
block random_profile from accessing sys channels
2016-06-07 22:55:24 -07:00
redmatrix
5ef8199dae
Finish the config family
2016-06-07 18:17:39 -07:00
Andrew Manning
cf180f6142
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-07 20:43:49 -04:00
redmatrix
a50e555515
'recent photos' query was buggered, also fix issue #163 by adding configurable sort order to the album widget - default is album name ascending
2016-06-07 16:23:14 -07:00
redmatrix
037cd74e8e
rename admin/users to admin/accounts, provide sortable columns in account and channel summaries - issue #255
2016-06-06 19:44:22 -07:00
redmatrix
adecd2960e
move pconfig to static class
2016-06-05 22:18:17 -07:00
Andrew Manning
4528becf4c
Remove debugging logger statements
2016-06-05 20:52:40 -04:00
Andrew Manning
08a9553ccc
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-05 16:52:02 -04:00
Andrew Manning
0a3fbdd128
Basic page reversion implemented. The revert button on the history view replaces the editor text but does not save the page.
2016-06-05 16:32:03 -04:00
redmatrix
dd6718c2cd
provide a hover class for smiley emojis which renders them slightly larger on compatible devices when you single them out for inspection
2016-06-04 18:10:42 -07:00
redmatrix
c1a24d44a3
another switch of type and ttype
2016-06-04 17:17:48 -07:00
redmatrix
bf438f67e1
the :tone variants are messed up, remove them
2016-06-04 17:13:55 -07:00
redmatrix
81f6511d34
return of the project smilie
2016-06-04 17:09:37 -07:00
redmatrix
a6012af00d
For emojis in posts, extend smilies and save a lot of duplication of effort
2016-06-04 17:06:12 -07:00
redmatrix
2c7ce20ccf
cross-site encoding issue with tags
2016-06-04 15:04:14 -07:00
Andrew Manning
4bc4fd5b7e
Page deletion implemented. Hide the delete button and disallow for Home page.
2016-06-04 18:00:32 -04:00
Andrew Manning
344c293424
Wiki and page filenames are abstracted from their displayed names. Special characters do not seem to break things.
2016-06-04 15:12:04 -04:00
Andrew Manning
b5d8443f59
Created three distinct names for wiki and page that are suitable for URL, HTML, and raw display. Implemented in new wiki POST activity only so far.
2016-06-04 06:26:41 -04:00
Andrew Manning
c08f428b5e
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-04 05:45:53 -04:00
redmatrix
20a79c7acf
allow bbcode emojis (at least the single unicode character forms)
2016-06-03 22:00:53 -07:00
redmatrix
e81ac9e063
turn emoji ability into a feature so that either a member or the site admin can disable it. Default is enabled.
2016-06-03 16:04:54 -07:00
redmatrix
624f4641e2
missed an object -> obj conversion in prepare_body
2016-06-03 15:09:58 -07:00
Andrew Manning
b93e398674
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-02 22:32:50 -04:00
Andrew Manning
b70c680964
Major corrections to access control and page construction.
2016-06-02 22:27:26 -04:00
redmatrix
f9075e2a2f
some initial emoji reaction work
2016-06-02 18:42:51 -07:00
redmatrix
a9d7acda27
the rest of the schema updates - WARNING: some third party plugins may fail; e.g. embedphotos and chess. $item['object'] is now $item['obj'] and $photo['type'] is $photo['mimetype'], $photo['scale'] is $photo['imgscale'] and $photo['data'] is now $photo['content']. There are a number of other changes, but these are the ones noted to cause issues with third-party plugins. The project plugins have been updated. Please note any new issues as this effort touched a lot of code in a lot of files.
2016-06-01 21:48:54 -07:00
redmatrix
b1259876bf
more db column renames
2016-05-31 21:45:33 -07:00
redmatrix
dfb6255f59
more removal of reserved words from DB schemas
2016-05-31 17:50:47 -07:00
redmatrix
00b4843425
provide a sort of mutex lock around db logging so it can't possibly recurse. Previous attempts to do something similar using other methods haven't worked out satisfactorily.
2016-05-31 16:16:54 -07:00
redmatrix
701acf59e2
don't remove missing hooks while update_r1169 is happpening - temp fix
2016-05-31 13:22:47 -07:00
redmatrix
44d3dadb03
don't update hubloc_connected any more often than 15 minutes. We don't require that level of granularity and the frequent writes are causing issues with the stability of that table.
2016-05-30 20:59:46 -07:00
redmatrix
9e9f2e13fe
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-30 19:49:15 -07:00
redmatrix
6602ff83dd
start removing reserved words from database column names (this run: addon and hook)
2016-05-30 19:44:30 -07:00
Andrew Manning
8d284bab47
Created page history widget to dynamically fetch and display the git commit history for wiki pages.
2016-05-30 20:59:54 -04:00
redmatrix
490ab9e2c5
begin moving config to zotlabs. Leave procedural stubs for backward comaptibility
2016-05-30 16:42:29 -07:00
hubzilla
0757dbf07f
Merge pull request #405 from git-marijus/dev
...
render code bbcode inline if there are no linebreaks in the text.
2016-05-31 09:07:22 +10:00
redmatrix
f35609d26c
redundant dev line from an earlier modification causes issue #404
2016-05-30 13:25:58 -07:00
Andrew Manning
a52cdcb241
Replaced wiki item record object field with ActivityStreams information. Wiki git repo path is stored in iconfig instead.
2016-05-30 14:59:33 -04:00
Mario Vavti
d1efb59fcd
render code bbcode inline if there are no linebreaks in the text.
2016-05-30 16:12:48 +02:00
Andrew Manning
8f0c3f0e9b
Merge remote-tracking branch 'upstream/dev' into wiki
2016-05-29 21:45:54 -04:00
redmatrix
3b2679db29
fix remote_channel(), update php minversion requirement
2016-05-29 18:38:24 -07:00
Andrew Manning
4b350b9090
Fixed bug in access control. Hide new wiki/page buttons if not channel owner.
2016-05-29 21:23:56 -04:00
Andrew Manning
00d32f6b94
Only show wiki delete control if channel owner
2016-05-29 20:39:19 -04:00
Andrew Manning
75b169f391
Fixed bug where page file was not loaded because of urlencoding/urldecoding
2016-05-29 13:50:32 -04:00
Andrew Manning
63a97ff6fc
Git commit made for the page edits when the page is saved.
2016-05-29 10:18:26 -04:00
Andrew Manning
ab54bf5149
Wiki pages can be saved.
2016-05-28 15:11:19 -04:00
Andrew Manning
7393dccde8
Page content is loaded from the file on disk
2016-05-28 12:33:07 -04:00
Andrew Manning
ae94e8a855
Wiki page list links work. File content is not yet loaded into the editor. Removed some logger calls.
2016-05-28 07:42:18 -04:00
Andrew Manning
f884fa6678
Wiki page list is fetched and the page widget is updated
2016-05-28 07:17:42 -04:00
Andrew Manning
4691c3ec01
Add new page to wiki and redirect to editor page.
2016-05-27 22:19:05 -04:00
Andrew Manning
ca78ebce6d
Check if wiki exists and redirect if it does not
2016-05-27 20:37:37 -04:00
Andrew Manning
97e6b7c4ba
Wiki deletion works
2016-05-27 20:20:33 -04:00
Andrew Manning
d554681174
Merge remote-tracking branch 'upstream/dev' into wiki
2016-05-27 06:35:15 -04:00
redmatrix
61304d80d2
track down some issues from the application logs
2016-05-26 18:45:47 -07:00
redmatrix
096fdfc61b
consolidate all the sys_boot functionality that is common between the web server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so.
2016-05-26 16:33:01 -07:00
redmatrix
7b91e551c4
kill off mcrypt
2016-05-26 13:21:43 -07:00
redmatrix
2f64684299
some event fixes, also change jquery-textcomplete to un-minified since the minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it.
2016-05-25 20:06:21 -07:00
redmatrix
66b6f8c0ff
app rendering issues, typo in class name and could not find icon 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead
2016-05-25 17:30:15 -07:00
redmatrix
0d8dcdbbc9
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-25 13:46:55 -07:00
redmatrix
da19ac98dd
Just set it and forget it.
2016-05-25 13:46:19 -07:00
Mario Vavti
9908a7193a
remove the add others button for now - after some research it turned out not beeing so useful
2016-05-25 14:31:58 +02:00
redmatrix
c37eaff263
require token signatures in zot_refresh, also move channel specific stuff into include/channel.php from include/connections.php
2016-05-24 23:05:00 -07:00
redmatrix
80f2ba640e
code cleanup
2016-05-24 20:49:23 -07:00
redmatrix
f9a295a236
Add space between project name and server type
2016-05-24 19:25:10 -07:00
redmatrix
516c43ba15
more work associated with DBA and index.php shuffle
2016-05-24 17:54:45 -07:00
redmatrix
84ba6393ad
relocate index and db
2016-05-24 16:36:55 -07:00
Andrew Manning
e00b8a7082
Delete wiki (in progress)
2016-05-24 06:15:42 -04:00
redmatrix
29ba891809
moved enotify
2016-05-24 01:25:13 -07:00
redmatrix
bbc71343bd
change the signed token format. We don't folks to be able to submit random text for signing by us, as they could then use these to generate known signatures.
2016-05-22 22:44:13 -07:00
redmatrix
1aa3051e97
move chatroom stuff to zlib
2016-05-22 20:54:52 -07:00
redmatrix
2d06663490
move apps to zlib
2016-05-22 19:25:27 -07:00
redmatrix
5e0698ba87
turn the oft-repeated block_public ... check into a function observer_prohibited()
2016-05-22 17:52:30 -07:00
redmatrix
de006771c7
renamed include files identity.php (channel.php) and Contact.php (connections.php)
2016-05-22 16:54:30 -07:00
Andrew Manning
a36bef7979
List of wikis populates with links according to observer permissions.
2016-05-21 21:55:09 -04:00
redmatrix
1cb311cef9
finish updating zot_finger instances
2016-05-21 18:18:33 -07:00
redmatrix
ed56b6e67b
first cut at zot-finger request signatures
2016-05-21 18:02:14 -07:00
Andrew Manning
049147a9d7
Successful new wiki git repo and item table record
2016-05-21 19:02:23 -04:00
Andrew Manning
c6aa42773a
Trying to fix wiki branch starting fresh from dev
2016-05-21 14:56:42 -04:00
redmatrix
bf05012150
relocate the (unused currently) protocol driver
2016-05-20 23:12:06 -07:00
redmatrix
d8ace38041
rework the conversation object stuff at a high level - still needs a bit of refactoring
2016-05-20 22:52:47 -07:00
redmatrix
019250eff8
consolidate include/*_selectors.php (not touching acl_selectors for the moment, as it will likely end up with a different disposition)
2016-05-20 22:13:20 -07:00
redmatrix
f4da365abd
move template stuff to zotlabs/render
2016-05-20 19:11:14 -07:00
redmatrix
b2f0d2d085
cleanup proc_run after messing it up with debugging yesterday
2016-05-20 17:44:26 -07:00
redmatrix
cae380f068
case issue
2016-05-20 01:21:19 -07:00
redmatrix
a97e7b2758
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-19 22:48:58 -07:00
redmatrix
f228bf4555
typo uncovered during tests
2016-05-19 22:33:01 -07:00
redmatrix
a2cec8899a
daemon conversion continued...
2016-05-19 22:26:37 -07:00
redmatrix
39bc0664a7
Separate cron into periodic components and use that as the main interface for scheduled tasks instead of the quaint 'poller'.
2016-05-19 21:22:04 -07:00
redmatrix
853322e7d2
don't try to deliver empty hashes
2016-05-19 20:48:40 -07:00
redmatrix
9cb1ac3de5
daemon master: create some compatibility code
2016-05-19 20:36:32 -07:00
redmatrix
6e7d7c5017
minor
2016-05-19 16:48:10 -07:00
Mario Vavti
1f2bd00d93
whitespace
2016-05-19 23:39:05 +02:00
Mario Vavti
c7cad6ab60
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-05-19 23:35:48 +02:00
Mario Vavti
0f5eb65210
provide an acl select option for only me
2016-05-19 23:35:19 +02:00
Treer
6b69184554
fix permission string
2016-05-19 22:37:21 +10:00
redmatrix
3355210878
explain what we're doing and where we're going with this.
2016-05-18 22:03:43 -07:00
redmatrix
d38851023e
provide server role on pubsites page
2016-05-18 16:28:51 -07:00
Mario Vavti
c77732b8ed
only show $showall_origin if permission_role is custom. it does not make much sense otherwise since the member is merely using a preset of permissions.
2016-05-18 21:23:24 +02:00
redmatrix
16f79b70e4
experimental PDO DBA driver
2016-05-17 22:32:49 -07:00
redmatrix
43c2b22fca
cli utilities - argc and argv reversed. Not functionally incorrect since it was consistent but aesthetically incorrect.
2016-05-17 19:49:21 -07:00
hubzilla
9a64c6b9f7
Merge pull request #389 from sasiflo/dev_sasiflo_sync
...
Synchronization: Directory creation on sync import corrected.
2016-05-18 12:16:20 +10:00
redmatrix
20cb4130d4
support work for a long-term fix for issue #390 , essentially one can specify a theme:schema string anywhere a theme is input. It will be honoured unless an existing schema setting over-rides this behaviour. This should also be backward compatible but the theme selection code has been cleaned up slightly and there may be subtle differences in behaviour after this commit. On my site this required a page refresh as the first page load after this change was a bit confused.
2016-05-17 17:46:30 -07:00
sasiflo
bfbe6c1660
Synchronization: Directory creation on sync import corrected.
2016-05-17 12:27:15 +02:00
redmatrix
0d04a1221a
issue #386 (master)
2016-05-16 19:38:38 -07:00
redmatrix
883b1ff513
an issue related to #386
2016-05-16 19:23:42 -07:00
redmatrix
2dcedd6951
more work on sessions and cookies, as some anomalies appeared in caldav and firefox which suggested deeper issues
2016-05-16 17:07:39 -07:00
redmatrix
217db8f9b2
provide tools to extract a pdo constructor
2016-05-15 19:16:55 -07:00
redmatrix
b14dd0e066
issue #383
2016-05-14 21:05:24 -07:00
redmatrix
ec81ef7b8d
issue #383
2016-05-14 21:04:19 -07:00
Mario Vavti
1e00fa79b3
change wording restricted -> custom selection and add a label to the select
2016-05-13 17:38:50 +02:00
Mario Vavti
573dea42d0
instead of radio buttons use select to choose between public and restricted acl. if restricted is selected acl is set to default. if there is no default acl will be set to self. if public is selected acl-list will be hidden and acl-info is visible.
2016-05-13 16:22:43 +02:00
redmatrix
522fec5763
split off feed handling stuff from include/items
2016-05-12 20:21:04 -07:00
redmatrix
f2fc7d25c5
remove the rarely if ever used filter_insecure() function. We will provide this functionality in other ways.
2016-05-12 20:02:16 -07:00
redmatrix
2d79e75788
SECURITY: edited comment to private post loses privacy info. Not visible in stream but may be visible in feeds
2016-05-12 16:51:20 -07:00
redmatrix
781716277b
SECURITY: a comment to a private post that has been edited (the comment has been edited) loses its privacy settings. This comment isn't visible in the stream but may be visible in feeds.
2016-05-12 16:47:03 -07:00
redmatrix
32ad8bbaac
Ensure that channels can't be created with DAV reserved paths as a redress. Sabre mentions in several places that trying to change these paths to other strings; while possible - is unsupported and likely to cause problems. So for now, we're stuck with 'principals', 'addressbooks', and 'calendars'. If you already have these redresses on your site, you're basically buggered.
2016-05-11 17:18:17 -07:00
redmatrix
4dd3839c41
provide repository versions on admin summary page and an upgrade message if you're behind master
2016-05-10 21:46:04 -07:00
redmatrix
915bd2ec77
sabre upgrade
2016-05-10 19:40:15 -07:00
redmatrix
0b02a6d123
initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)
2016-05-10 17:26:44 -07:00
redmatrix
f658a3cae1
more work on diaspora relay
2016-05-09 20:17:59 -07:00
Treer
ef97e5a063
minor cleanup. No functional changes
2016-05-10 00:15:57 +10:00