[Kimchi-devel] [PATCH v2] [Wok] Adding DataTables.net plugin and Moment.js to Wok

[Aline Manera]

Hi Samuel,

Could you, please, send the patch attached to me?
I was not able to apply it.

[alinefm at alinefm-TP440 wok]$ git am -3 
/home/alinefm/mail-patches/\[PATCH\ v2\]\ \[Wok\]\ Adding\ 
DataTables.net\ plugin\ and\ Moment.js\ to\ Wok.eml
Applying: Adding DataTables.net plugin and Moment.js to Wok
fatal: corrupt patch at line 738
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Adding DataTables.net plugin and Moment.js to Wok
The copy of the patch that failed is found in:
    /home/alinefm/wok/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Thanks,
Aline Manera

On 06/27/2016 04:23 PM, sguimaraes943 at gmail.com wrote:
> From: Samuel Guimarães <sguimaraes943 at gmail.com>
>
> Some files are minified. Let me know if they were corrupted by git send-email --no-validate
>
> This commit adds DataTables.net jQuery plugin and Moment.js library to Wok.
>
> DataTables.net is a table plugin that supports pagination, instance search and multi-column ordering. It also has a responsive module and it is compatible with many different CSS libraries.
> In this commit it is included a customization for its Bootstrap integration and a default initialization script pre-loaded with Wok styles.
>
> Moment.js is a lightweight JavaScript date library for parsing, validating, manipulating, and formatting dates. It is required in order to filter and sort dates properly in Wok User Logs and Ginger Configuration Backup.
>
> v2 - Added minified files that were ignored by .gitignore
>
> Samuel Guimarães (1):
>    Adding DataTables.net plugin and Moment.js to Wok
>
>   configure.ac                                   |   3 +
>   ui/css/Makefile.am                             |   8 +-
>   ui/css/datatables.bootstrap.css                | 243 +++++++++++++++++++++
>   ui/css/src/datatables.bootstrap.scss           | 289 +++++++++++++++++++++++++
>   ui/js/src/wok.datatables.js                    |  26 +++
>   ui/libs/Makefile.am                            |   2 +-
>   ui/libs/datatables/Makefile.am                 |  23 ++
>   ui/libs/datatables/css/Makefile.am             |  21 ++
>   ui/libs/datatables/css/datatables.min.css      |  15 ++
>   ui/libs/datatables/datatables.bootstrap.min.js |   8 +
>   ui/libs/datatables/datatables.min.js           | 190 ++++++++++++++++
>   ui/libs/moment/LICENSE                         |  22 ++
>   ui/libs/moment/Makefile.am                     |  21 ++
>   ui/libs/moment/moment-with-locales.min.js      |  76 +++++++
>   ui/pages/login.html.tmpl                       |   5 +
>   ui/pages/wok-ui.html.tmpl                      |   5 +
>   16 files changed, 954 insertions(+), 3 deletions(-)
>   create mode 100644 ui/css/datatables.bootstrap.css
>   create mode 100644 ui/css/src/datatables.bootstrap.scss
>   create mode 100644 ui/js/src/wok.datatables.js
>   create mode 100644 ui/libs/datatables/Makefile.am
>   create mode 100644 ui/libs/datatables/css/Makefile.am
>   create mode 100644 ui/libs/datatables/css/datatables.min.css
>   create mode 100644 ui/libs/datatables/datatables.bootstrap.min.js
>   create mode 100644 ui/libs/datatables/datatables.min.js
>   create mode 100644 ui/libs/moment/LICENSE
>   create mode 100644 ui/libs/moment/Makefile.am
>   create mode 100644 ui/libs/moment/moment-with-locales.min.js
>