 jekkos
|
dc0245c4fb
|
Merge branch 'feature/composer' of https://github.com/jekkos/opensourcepos into feature/composer
|
2016-08-23 18:28:50 +02:00 |
|
|
jekkos
|
e25c330dff
|
Move COPYING to license/ folder
Add bower_components to .gitignore
Regenerate licenses
|
2016-08-22 13:37:09 +02:00 |
|
|
jekkos
|
e302086b13
|
Merge branch 'master' into feature/composer
Conflicts:
.travis.yml
application/controllers/Login.php
application/views/partial/header.php
public/dist/opensourcepos.min.js
|
2016-08-19 12:09:38 +02:00 |
|
|
FrancescoUK
|
45675b8f29
|
Copy COPYING file to license dir, update js plugin, regen dist files
|
2016-08-18 20:17:54 +01:00 |
|
|
jekkos
|
64d0483300
|
Fix environment variable in .travis.yml
|
2016-08-18 16:06:03 +02:00 |
|
|
jekkos
|
798246e589
|
Strip feature name branch from docker image tag
|
2016-08-18 14:01:47 +02:00 |
|
|
jekkos
|
2c1231ca61
|
Install CI langauges in system/language as before (#624)
Map CI language folder with ospos language code
|
2016-08-18 13:33:02 +02:00 |
|
|
jekkos
|
d6b009fba8
|
Fix build after rebase with master
Enable php socket extension in Dockerfile
|
2016-08-18 13:33:01 +02:00 |
|
|
jekkos
|
ad8d0821ad
|
Correct license output directory in Gruntfile (#624)
|
2016-08-18 13:33:01 +02:00 |
|
|
jekkos
|
a6ba67e2fc
|
Change project layout for composer (#624)
|
2016-08-18 13:33:01 +02:00 |
|
|
jekkos
|
9e1afd3f2b
|
Push branch to new docker image tag
|
2016-08-18 13:32:59 +02:00 |
|
|
jekkos
|
43e7e353e7
|
Push branch to new docker image tag
|
2016-08-18 13:19:44 +02:00 |
|
|
jekkos
|
e4fc2ac06b
|
Fix script-tag plugin version to use absolutePath option (#612)
|
2016-08-18 10:28:47 +02:00 |
|
|
jekkos
|
59bbe55215
|
Install CI langauges in system/language as before (#624)
Map CI language folder with ospos language code
|
2016-08-18 08:27:54 +02:00 |
|
|
FrancescoUK
|
6b63e381f9
|
Security fix: set OSPOS to be production code by default if CI_ENV is not set (#808)
|
2016-08-15 18:31:22 +01:00 |
|
|
jekkos
|
af6b323013
|
Fix build after rebase with master
Enable php socket extension in Dockerfile
|
2016-08-14 11:58:15 +02:00 |
|
|
jekkos
|
919e478184
|
Correct license output directory in Gruntfile (#624)
|
2016-08-14 11:58:15 +02:00 |
|
|
jekkos
|
3f34775000
|
Change project layout for composer (#624)
|
2016-08-14 11:58:15 +02:00 |
|
|
FrancescoUK
|
6e7da88f94
|
Further tweaking of README.md
|
2016-08-14 10:00:25 +01:00 |
|
|
FrancescoUK
|
cf1eec761b
|
Further adjustments to README.md
|
2016-08-14 09:44:49 +01:00 |
|
|
FrancescoUK
|
b51022e93f
|
Updated to README.md
|
2016-08-14 09:38:28 +01:00 |
|
|
FrancescoUK
|
2bda02dd74
|
Further bug fixes
|
2016-08-13 18:17:17 +01:00 |
|
|
FrancescoUK
|
01aeca579a
|
Code refactoring and bug fixes
|
2016-08-13 14:07:27 +01:00 |
|
|
FrancescoUK
|
2555203a54
|
Arab translation amendments (#794)
|
2016-08-12 21:51:35 +01:00 |
|
|
FrancescoUK
|
4f5f875f1e
|
Amend license files
|
2016-08-12 21:30:41 +01:00 |
|
|
FrancescoUK
|
b77d368885
|
Refactoring and statistics support
|
2016-08-12 21:23:26 +01:00 |
|
|
FrancescoUK
|
4b569d093b
|
Made the password input glyphicons consistent across OSPOS (#731)
|
2016-08-12 10:13:43 +01:00 |
|
|
FrancescoUK
|
51bdfc050e
|
Update Spanish translation (#750)
|
2016-08-11 22:26:18 +01:00 |
|
|
FrancescoUK
|
1b19fed206
|
Updated login page (#731)
|
2016-08-11 18:36:59 +01:00 |
|
|
FrancescoUK
|
3336d42245
|
Solved .bowerrc command line issue causing bower update to fail (#359)
|
2016-08-11 15:56:33 +01:00 |
|
|
FrancescoUK
|
6fdecbe619
|
Refactor Gruntfile.js bowercopy section (#409)
|
2016-08-11 14:38:08 +01:00 |
|
|
FrancescoUK
|
55764d7625
|
Updated Theme translation (#794)
|
2016-08-11 13:26:39 +01:00 |
|
|
FrancescoUK
|
dd8d848544
|
Updated Arabic (EG) and Portuguese (BR) translations (#794 #795)
|
2016-08-11 09:41:45 +01:00 |
|
|
jekkos
|
6203504976
|
Remove bootstrap 3.3.6 js from minified file (#489)
Cleanup dist/ folder (remove duplicated bootswatch themes)
|
2016-08-11 08:28:37 +02:00 |
|
|
jekkos
|
059ec54c72
|
Make theme configurable from config module (#409)
Add symlink to bower_components in Docker dev environment (#616)
Move header_debug content back into header view
|
2016-08-10 18:58:17 +02:00 |
|
|
jekkos
|
75567b9620
|
Fix bootstrap.min.css load in login and header (#409)
|
2016-08-10 17:16:00 +02:00 |
|
|
jekkos
|
1b859a8726
|
Manually install docker-compose in build environment (#616)
|
2016-08-10 16:00:44 +02:00 |
|
|
jekkos
|
1c02508759
|
Use docker environment from travis-ci (#616)
|
2016-08-10 15:49:20 +02:00 |
|
|
jekkos
|
4c337aa5c6
|
Try to fix travis docker setup + remove jquery validator override (#788, #616)
|
2016-08-10 15:26:18 +02:00 |
|
|
jekkos
|
523714c26a
|
Run license generation only after bower install or uninstall (#359)
|
2016-08-10 14:47:01 +02:00 |
|
|
FrancescoUK
|
28e776248b
|
Store all used stylesheets in dist dir, don't rely on css dir (#409)
|
2016-08-10 10:53:27 +01:00 |
|
|
FrancescoUK
|
333067955c
|
Improved theme config option comment (#409)
|
2016-08-10 10:53:27 +01:00 |
|
|
FrancescoUK
|
a0886caf2f
|
Added all bootswatch themes and made theming configurable from config.php (#409)
|
2016-08-10 10:53:27 +01:00 |
|
|
jekkos
|
31cc67ea52
|
Regenerate LICENSES with .bower.json first (#359)
|
2016-08-10 09:04:59 +02:00 |
|
|
jekkos
|
8b08bf5daa
|
Add frontside support for locale dependent number validation (#788)
|
2016-08-09 18:20:52 +02:00 |
|
|
FrancescoUK
|
597a5caee5
|
XSS clean the license text (#359)
|
2016-08-08 16:09:40 +01:00 |
|
|
FrancescoUK
|
19403adde2
|
Read plugin LICENSES json and display in Store Config (#359)
|
2016-08-08 15:54:29 +01:00 |
|
|
FrancescoUK
|
119476ca74
|
Reorder license steps in Gruntfile.js (#359)
|
2016-08-08 10:04:43 +01:00 |
|
|
FrancescoUK
|
dd07b9fcb8
|
Add grunt license checker (#359)
|
2016-08-08 09:32:45 +01:00 |
|
|
jekkos
|
4a54dc7dc7
|
Add license plugin for grunt (#359)
|
2016-08-08 10:19:02 +02:00 |
|