← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to views/applications-page.twig

  • Committer: GitHub
  • Author(s): Dan Garner
  • Date: 2017-02-14 08:53:21 UTC
  • mfrom: (552.1.1)
  • Revision ID: git-v1:28b5a08b8293d0566da12863dbf2bde244f28804
Merge pull request #237 from maurofmferrao/develop

Complete conflict resolution for https://github.com/xibosignage/xibo-cms/pull/234

Show diffs side-by-side

added added

removed removed

Lines of Context:
views/applications-page.twig
32
32
                        <thead>
33
33
                            <tr>
34
34
                                <th>{% trans "Name" %}</th>
 
35
                                <th>{% trans "Owner" %}</th>
35
36
                                <th></th>
36
37
                            </tr>
37
38
                        </thead>
55
56
            ajax: "{{ urlFor("application.search") }}",
56
57
            "columns": [
57
58
                { "data": "name" },
 
59
                { "data": "owner" },
58
60
                {
59
61
                    "orderable": false,
60
62
                    "data": dataTableButtonsColumn