Mario Vavti
|
1523e116b9
|
Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32
|
2016-05-30 10:12:39 +02:00 |
|
Mario Vavti
|
90f2959076
|
Merge branch 'dev' into sabre32
|
2016-05-30 10:10:44 +02:00 |
|
Mario Vavti
|
6d4adfcedc
|
Merge branch 'dev' into sabre32
|
2016-05-30 10:08:13 +02:00 |
|
redmatrix
|
f2ebe41a50
|
undefined function
|
2016-05-29 20:18:28 -07: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
|
a3dfdd9d38
|
Remove Parsedown library files and remove references.
|
2016-05-29 20:44:28 -04:00 |
|
Andrew Manning
|
00d32f6b94
|
Only show wiki delete control if channel owner
|
2016-05-29 20:39:19 -04:00 |
|
Andrew Manning
|
fad27fc1e7
|
Hide page controls when not owner. Fixed some serious access control issues.
|
2016-05-29 20:16:17 -04:00 |
|
Andrew Manning
|
3e6af5c876
|
Hacked Parsedown and Markdown to add class inline-code to <code> blocks for proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages.
|
2016-05-29 17:06:45 -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
|
df7772e301
|
Home page create with new wiki. URL redirects here when no page given. Fixed bug with author in wiki item table record.
|
2016-05-29 13:33:52 -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 |
|
Mario Vavti
|
cac6cef495
|
use composer to install sabre32
|
2016-05-29 10:58:11 +02:00 |
|
Mario Vavti
|
aab9766c53
|
missed some files
|
2016-05-29 00:33:28 +02:00 |
|
Andrew Manning
|
ab54bf5149
|
Wiki pages can be saved.
|
2016-05-28 15:11:19 -04:00 |
|
Andrew Manning
|
55b587002e
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-05-28 14:12:53 -04:00 |
|
Andrew Manning
|
819683a073
|
Show page content by default. Hide page controls where appropriate. Fix sandbox text format.
|
2016-05-28 14:11:36 -04:00 |
|
Andrew Manning
|
7393dccde8
|
Page content is loaded from the file on disk
|
2016-05-28 12:33:07 -04:00 |
|
Mario Vavti
|
66effbfe08
|
upgrade to sabre32
|
2016-05-28 17:46:24 +02: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 |
|
redmatrix
|
ac4688eac0
|
allow objs to represent inventory
|
2016-05-27 23:57:47 -07: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 |
|
redmatrix
|
ab6eb1c4b2
|
strings update
|
2016-05-27 16:11:58 -07:00 |
|
redmatrix
|
0919c1eb61
|
check for session before querying session vars
|
2016-05-27 16:09:44 -07:00 |
|
Andrew Manning
|
d554681174
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-05-27 06:35:15 -04:00 |
|
redmatrix
|
551cf8ee94
|
link to hubchart site for site detail on pubsites page
|
2016-05-26 19:40:16 -07:00 |
|
redmatrix
|
61304d80d2
|
track down some issues from the application logs
|
2016-05-26 18:45:47 -07:00 |
|
redmatrix
|
1bce285eca
|
don't need quite so many backslashes
|
2016-05-26 17:51:59 -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
|
8e4889bdf1
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-26 13:22:29 -07:00 |
|
redmatrix
|
7b91e551c4
|
kill off mcrypt
|
2016-05-26 13:21:43 -07:00 |
|
Mario Vavti
|
9d7abd58ac
|
another typo
|
2016-05-26 14:37:30 +02:00 |
|
Mario Vavti
|
24360fd191
|
check if $addonDir is a dir to silence warning if it does not exist
|
2016-05-26 14:33:10 +02:00 |
|
Mario Vavti
|
9017dcd0fd
|
typo
|
2016-05-26 14:23:17 +02:00 |
|
redmatrix
|
30d0f21079
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-25 21:32:40 -07:00 |
|
redmatrix
|
d78bc12cbe
|
update to the bug doco
|
2016-05-25 21:32:13 -07:00 |
|
hubzilla
|
2a9c1db0c9
|
Merge pull request #402 from git-marijus/dev
another try on #385 - replace sabres restrictive CSP with what we do in boot.php
|
2016-05-26 14:25:48 +10:00 |
|
redmatrix
|
4716627453
|
run background/daemon tasks at approximately 4 hour intervals from web accesses if they aren't being run otherwise. This ensures they run, although perhaps a bit infrequently; even if unconfigured. This is not suitable for a production site, but may be acceptable for small single person hubs and test sites. The 'cron warning email' now means that background processes are totally borked; probably due to a fascist hosting provider that has blocked process execution.
|
2016-05-25 21:10:13 -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
|
e559f8b6a1
|
duplicate daemon run of cronhooks
|
2016-05-25 16:48:32 -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
|
45568bf097
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-05-25 14:32:17 +02: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 |
|