- Committer: GitHub
- 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
Complete conflict resolution for https://github.com/xibosignage/xibo-cms/pull/234
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bin
|
493 | 8 years ago | Dan Garner | Merge pull request #149 from dasgarner/develop Po |
|
||
|
custom
|
483 | 9 years ago | Dan Garner | Merge pull request #138 from dasgarner/complex-mod |
|
||
|
install
|
251 | 10 years ago | Dan Garner | Migrated from BZR and moved files to root folder. |
|
||
|
lib
|
251 | 10 years ago | Dan Garner | Migrated from BZR and moved files to root folder. |
|
||
|
locale
|
251 | 10 years ago | Dan Garner | Migrated from BZR and moved files to root folder. |
|
||
|
modules
|
251 | 10 years ago | Dan Garner | Migrated from BZR and moved files to root folder. |
|
||
|
tasks
|
540 | 8 years ago | GitHub | Merge pull request #221 from dasgarner/feature/tas |
|
||
|
tests
|
429 | 9 years ago | Dan Garner | Merge pull request #69 from dasgarner/feature/play |
|
||
|
views
|
399 | 9 years ago | Dan Garner | Started work on Twig templating. |
|
||
|
web
|
384 | 9 years ago | Dan Garner | Moved web servable files to web folder |
|
||
.gitattributes |
427.1.1 | 9 years ago | Dan Garner | Added recommended gitattributes file to fix line e | 378 bytes |
|
|
|
.gitignore |
527.1.3 | 8 years ago | Dan Garner | Fixes for upgrade steps | 128 bytes |
|
|
|
bower.json.sample |
526.1.3 | 8 years ago | Dan Garner | Complete gulp-build scripts for PHP. | 1.3 KB |
|
|
|
composer.json |
551.1.17 | 8 years ago | Dan Garner | Bump XMR requirement to 0.3 to take advantage of i | 2.2 KB |
|
|
|
composer.lock |
549 | 8 years ago | GitHub | 1.8.0 rc1 pack2 (#229) * DisplayNotifyService - f | 181 KB |
|
|
|
CONTRIBUTING.md |
253.2.10 | 10 years ago | Dan Garner | Added contributing file and notice. | 739 bytes |
|
|
|
gulpfile.js |
551.1.2 | 8 years ago | Dan Garner | Bump version pre-archive build | 3.3 KB |
|
|
|
LICENSE |
0.1.1 | 10 years ago | Dan Garner | Initial commit | 33.6 KB |
|
|
|
package.json |
526.1.3 | 8 years ago | Dan Garner | Complete gulp-build scripts for PHP. | 779 bytes |
|
|
|
phpunit.xml |
502.4.3 | 8 years ago | Alex Harrington | Move logIncompleteSkipped flag to the correct plac | 690 bytes |
|
|
|
README.md |
523.1.1 | 8 years ago | Dan Garner | Extract user theme data into its own custom folder | 4.8 KB |
|
|
|
Vagrantfile |
532.1.16 | 8 years ago | Dan Garner | Merge branch 'feature/test-suite' of https://githu | 2.3 KB |
|
|