aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-042-69/+90
|\
| * allow any (current) emoji to be displayed on any site, and provide a default ↵redmatrix2016-06-031-14/+4
| | | | | | | | list of reactions that can be over-ridden via configuration if a site doesn't like our choices or perhaps the ordering of our choices.
| * turn emoji ability into a feature so that either a member or the site admin ↵redmatrix2016-06-031-1/+1
| | | | | | | | can disable it. Default is enabled.
| * some theming for emoji buttonMario Vavti2016-06-031-95/+91
| |
| * restrict emoji reactions to the top level for now.redmatrix2016-06-021-0/+2
| |
| * menu entries for basic emoji support. I could use a bit of help theming ↵redmatrix2016-06-022-0/+33
| | | | | | | | this. It may also be better rendered as a panel of buttons than a dropdown menu. Eventually we should probably allow the system admin to configure the emojis they want; as there are a large number. I only brought in a small collection that I thought would be most useful as post reactions.
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-024-11/+19
|\|
| * more db column renamesredmatrix2016-05-313-10/+18
| |
| * more removal of reserved words from DB schemasredmatrix2016-05-311-1/+1
| |
* | Major corrections to access control and page construction.Andrew Manning2016-06-021-0/+2
| |
* | Created page history widget to dynamically fetch and display the git commit ↵Andrew Manning2016-05-302-1/+39
| | | | | | | | history for wiki pages.
* | Replaced wiki item record object field with ActivityStreams information. ↵Andrew Manning2016-05-301-1/+1
| | | | | | | | Wiki git repo path is stored in iconfig instead.
* | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-291-0/+2
| |
* | Only show wiki delete control if channel ownerAndrew Manning2016-05-291-0/+2
| |
* | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for ↵Andrew Manning2016-05-291-0/+6
| | | | | | | | proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages.
* | Home page create with new wiki. URL redirects here when no page given. Fixed ↵Andrew Manning2016-05-291-1/+1
| | | | | | | | bug with author in wiki item table record.
* | Wiki pages can be saved.Andrew Manning2016-05-281-2/+21
| |
* | Show page content by default. Hide page controls where appropriate. Fix ↵Andrew Manning2016-05-281-6/+8
| | | | | | | | sandbox text format.
* | Page content is loaded from the file on diskAndrew Manning2016-05-281-1/+1
| |
* | Wiki page list links work. File content is not yet loaded into the editor. ↵Andrew Manning2016-05-282-5/+6
| | | | | | | | Removed some logger calls.
* | Wiki page list is fetched and the page widget is updatedAndrew Manning2016-05-282-1/+18
| |
* | Add new page to wiki and redirect to editor page.Andrew Manning2016-05-271-0/+19
| |
* | Wiki deletion worksAndrew Manning2016-05-271-0/+2
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-273-6/+2
|\|
| * app rendering issues, typo in class name and could not find icon ↵redmatrix2016-05-251-1/+1
| | | | | | | | 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead
| * remove the add others button for now - after some research it turned out not ↵Mario Vavti2016-05-251-4/+0
| | | | | | | | beeing so useful
| * code cleanupredmatrix2016-05-241-1/+1
| |
* | Delete wiki (in progress)Andrew Manning2016-05-242-3/+24
| |
* | List of wikis populates with links according to observer permissions.Andrew Manning2016-05-212-7/+4
| |
* | Successful new wiki git repo and item table recordAndrew Manning2016-05-211-17/+4
| |
* | Forgot some templatesAndrew Manning2016-05-212-0/+21
| |
* | Trying to fix wiki branch starting fresh from devAndrew Manning2016-05-211-0/+114
|/
* possible fix for #385Mario Vavti2016-05-211-1/+1
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-191-17/+32
|\
| * Replace text strings for translation supportAndrew Manning2016-05-191-9/+3
| |
| * Improved plugin repo management UI in admin/pluginsAndrew Manning2016-05-191-17/+38
| |
* | provide an acl select option for only meMario Vavti2016-05-191-2/+7
|/
* Enable options for chat notifications, with optional audio. Notify for ↵Andrew Manning2016-05-131-3/+45
| | | | member entering room and incoming messages.
* change wording restricted -> custom selection and add a label to the selectMario Vavti2016-05-131-1/+1
|
* instead of radio buttons use select to choose between public and restricted ↵Mario Vavti2016-05-131-18/+13
| | | | 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.
* Merge remote-tracking branch 'upstream/dev' into chat-notifyAndrew Manning2016-05-112-23/+23
|\
| * Merge pull request #376 from anaqreon/plugin-reporedmatrix2016-05-121-3/+3
| |\ | | | | | | Check if target directories are writable when adding, updating, or removing plugin repos
| | * Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-111-0/+11
| | |\
| | * | Check if target directories are writable when adding, updating, or removing ↵Andrew Manning2016-05-111-3/+3
| | | | | | | | | | | | | | | | plugin repos
| * | | more whitespaceMario Vavti2016-05-111-1/+1
| | | |
| * | | whitespaceMario Vavti2016-05-111-19/+19
| | |/ | |/|
* / | Browser notification issued when member enters chat roomAndrew Manning2016-05-111-0/+76
|/ /
* / provide repository versions on admin summary page and an upgrade message if ↵redmatrix2016-05-101-0/+11
|/ | | | you're behind master
* Delete existing repo if the new one has a different URL. Fixed bug that ↵Andrew Manning2016-05-101-4/+8
| | | | could cause repeated installation.
* Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-093-6/+8
|\