Commit Graph

123 Commits

Author SHA1 Message Date
Mario Vavti a604236d89 missed a spot while resolving merge conflict 2017-12-06 12:40:27 +01:00
Mario Vavti 44cb68a356 resolve merge conflict 2017-12-06 09:12:28 +01:00
zotlabs 8451ee20c9 disallow backslashes in wiki and wiki-page names 2017-12-05 16:33:24 -08:00
zotlabs 40c625158f unable to change permissions on wiki with space in name 2017-11-08 21:19:03 -08:00
Mario Vavti cc1ffff7cd feed untranslated appnames to nav_set_selected() and query for the active app directly to get app details 2017-10-09 21:22:57 +02:00
Mario Vavti f99c007187 new notification changes - use sticky_kit instead of position fixed 2017-10-09 17:49:15 +02:00
Mario Vavti 6f2dd5d325 wiki: translateable strings and move page mimetype selector to options submenu 2017-09-20 11:08:01 +02:00
zotlabs e84281b620 wiki download: only include the latest page revision 2017-09-16 15:48:48 -07:00
Mario 373651c3db implement wiki editing 2017-09-15 22:17:18 +02:00
git-marijus 663802e699 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-09-15 16:30:14 +02:00
git-marijus 4c5722c766 some work on wiki acl 2017-09-15 16:27:30 +02:00
zotlabs cf120b2351 wiki: lock mimetype 2017-09-14 17:14:50 -07:00
zotlabs d7ec6865b4 bring back wiki download 2017-09-14 04:06:09 -07:00
zotlabs 55aaabc2f1 add text/plain type to wiki 2017-09-13 22:37:18 -07:00
zotlabs 796228b7ad wiki mimetype selection. We can add text/plain as soon as we add code to purify and render it specifically. 2017-09-12 23:15:30 -07:00
zotlabs 5e99295bf6 wiki mimetype selection 2017-09-12 22:32:31 -07:00
git-marijus 1bdcfe5219 provide a mechanism to mark apps active in the bin 2017-07-21 10:32:21 +02:00
zotlabs 9dbd997141 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-06-07 17:11:35 -07:00
git-marijus 7562f77bdf rewrite wiki pages widget - no need for ajax on pageload, show the pages to not authenticated people. 2017-06-03 17:23:53 +02:00
zotlabs da682717ab wiki auto language select to match webpages implementation 2017-05-23 21:51:17 +02:00
zotlabs 53057830e0 wiki auto language select to match webpages implementation 2017-05-22 20:18:47 -07:00
zotlabs a9cceea850 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-03-30 16:10:59 -07:00
Mario Vavti bb639b08f7 do not allow creating two wikis with the same name 2017-03-30 15:07:48 +02:00
zotlabs e97dd48b4c even more fine tuning of the markdown purifier - especially when used with the wiki 2017-03-29 14:03:24 +02:00
zotlabs d5525a38f1 various input filter fixes 2017-03-29 13:56:31 +02:00
zotlabs fa629841bd input filter updates 2017-03-29 13:39:36 +02:00
zotlabs e5e0a6b31f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-03-25 14:40:31 -07:00
zotlabs 35fc7328de even more fine tuning of the markdown purifier - especially when used with the wiki 2017-03-20 19:41:03 -07:00
Mario Vavti ca14ab3d55 move profile tabs to app-tray 2017-03-20 17:24:48 +01:00
zotlabs b0b96daec0 Merge branch 'dev' into merge 2017-03-18 17:00:09 -07:00
zotlabs 4afeefb5ce various input filter fixes 2017-03-18 16:41:43 -07:00
Klaus cbd401c3e8 Missed one old Markdown() 2017-03-18 14:15:02 +01:00
zotlabs 2c73b457ef input filter updates 2017-03-14 17:07:29 -07:00
Klaus Weidenbach 503c368f9e ⬆️ 🔨 Upgrade PHP Markdown library.
The current version throws deprecated warning with PHP7.1 and PHPUnit.
Upgrade the Markdown library to the current PHP Markdown Lib 1.7.0.
Used composer to manage this library.
2017-02-27 23:40:29 +01:00
Mario Vavti a6d13f290b fix js issue in markdown mimetype wikis if content contains quotes 2017-02-27 13:52:08 +01:00
Mario Vavti cbc0e5b934 do not lock out channels with only read perms from all post actions. we check read/write permissions for each command later in the process 2017-02-21 14:52:42 +01:00
zotlabs 573846707c fix several places where head_add_(css|js) functions have been used incorrectly. It appears that mistakes were made going back a long time and propagated. Here's the way it should work:
- if there is no preceding / character, we look for the file within all the appropriate theme directories.
- otherwise the file should have a preceding /, which means use this path relative to the hubzilla basedir
- files beginning with // are considered to be schemeless URLs.

Therefore 'foo.css' means find the best theme-able representation of foo.css.
'/library/foo.css' means only use the version of foo.css that is in /library.
2017-02-19 16:50:41 -08:00
zotlabs 94290102b6 tested extensible permissions by adding wiki permissions. Discovered a couple of issues that needed attention in the process. 2017-02-01 18:05:02 -08:00
zotlabs 22839e48d0 better handling of html special chars in wiki and wikipage names 2017-01-26 15:16:41 -08:00
Mario Vavti 54826808cf minor cleanup 2017-01-26 12:23:59 +01:00
Mario Vavti 02e8058c50 fix renaming of wiki pages 2017-01-26 10:46:44 +01:00
zotlabs 45dbd31d28 only allow wiki owner to delete pages 2017-01-25 12:21:52 -08:00
Mario Vavti 1db57c498d fixes for wiki create/delete page 2017-01-25 19:41:47 +01:00
zotlabs 9e70d54300 always sync parent wiki when syncing pages, just in case the original wiki creation wasn't synced. 2017-01-24 20:14:58 -08:00
Hubzilla 17f1d39fcf basic support for clone syncing of wikis and wiki pages 2017-01-22 18:48:45 -08:00
Hubzilla bb233a9872 add bbcode language conditionals to wiki 2017-01-20 15:42:15 -08:00
Mario Vavti 4295b1945e we need channel_id here not the whole channel 2017-01-19 10:02:26 +01:00
Hubzilla d4e58e94f6 native wiki updates 2017-01-18 18:18:37 -08:00
Hubzilla 6e504b7bc9 nwiki updates 2017-01-18 17:45:27 -08:00
zotlabs 231b70b987 call zidify_links() when formatting bbcode for internal consumption 2016-12-19 16:06:49 -08:00