 FrancescoUK
|
ea7cc16cc9
|
Regen dist files
|
2016-09-07 20:28:26 +01:00 |
|
|
FrancescoUK
|
e3c9cddacb
|
Merge branch 'master' into composer
|
2016-09-07 19:31:52 +01:00 |
|
|
FrancescoUK
|
aae1ce5329
|
Fixed deleted spaces when searching items (#838)
|
2016-09-07 17:12:50 +01:00 |
|
|
FrancescoUK
|
9012006e84
|
Updated invoice pdf support Dompdf to 0.7.0 (#839)
|
2016-09-07 08:58:05 +01:00 |
|
|
jekkos
|
91b18d032f
|
Replace DOMPDF, GaTracking with composer managed dependencies (#624)
Fix trim on search bug (#838)
|
2016-09-07 09:11:11 +02:00 |
|
|
FrancescoUK
|
d319c5a73d
|
Alternative fix to #833
|
2016-09-04 17:27:53 +01:00 |
|
|
FrancescoUK
|
f3270a545e
|
Fixed no internet connection causing blank page (#833)
|
2016-09-03 10:23:58 +01:00 |
|
|
jekkos
|
9e01ca2e43
|
Merge branch 'master' into feature/composer
|
2016-09-02 17:58:03 +02:00 |
|
|
jekkos
|
c3316040bb
|
Increase delay for autocomplete on item add form (#739)
|
2016-09-02 09:20:03 +02:00 |
|
|
jekkos
|
17084d8a8f
|
Fix employee creation + use new hashing in dbscript init (#855)
|
2016-09-01 20:26:25 +02:00 |
|
|
jekkos
|
71e54d90bf
|
Fix database init script + employee creation (#822)
|
2016-09-01 20:00:49 +02:00 |
|
|
jekkos
|
eb59079fe5
|
Regenerate sql scripts for hashing upgrade (#822)
|
2016-09-01 19:20:50 +02:00 |
|
|
jekkos
|
35f9904dbe
|
Upgrade old MD5 password hashing (#822)
|
2016-09-01 19:12:08 +02:00 |
|
|
jekkos
|
ce2c83b3f9
|
Set minimum precision for low number of tax / price decimals (#766)
|
2016-09-01 18:15:55 +02:00 |
|
|
jekkos
|
c88de60a9f
|
Make new config hook for loading stats
|
2016-09-01 08:53:06 +02:00 |
|
|
jekkos
|
2bf82e6472
|
Some additional statistics tweaks
|
2016-08-31 19:52:48 +02:00 |
|
|
FrancescoUK
|
3ce939ad20
|
Minor fixes
|
2016-08-30 18:01:05 +01:00 |
|
|
jekkos
|
96004f5699
|
Remove nominatim duplicates (#805)
Set default notification popup position to center bottom
|
2016-08-30 08:42:49 +02:00 |
|
|
jekkos
|
a2d2965785
|
Fix nominatim search suggestions + type in login (#805)
|
2016-08-29 23:30:41 +02:00 |
|
|
jekkos
|
3d15148b80
|
Fix broken js + css (regen with correct tags plugin version) (#809)
|
2016-08-29 23:00:15 +02:00 |
|
|
jekkos
|
31166c814e
|
Stop submitting cancel form when hitting enter in invoice number field (#809)
|
2016-08-29 18:10:55 +02:00 |
|
|
jekkos
|
0ec94f1044
|
Regenerate dist files
|
2016-08-29 17:54:49 +02:00 |
|
|
jekkos
|
6e7b32cb1b
|
Remove duplicate suggestions
Remove duplicate result suggestions in nominatim (#805)
|
2016-08-29 17:50:43 +02:00 |
|
|
jekkos
|
775c0cebf2
|
Some login (statistics) tweaks
|
2016-08-29 08:57:28 +02:00 |
|
|
jekkos
|
d67b33d996
|
Reorder inlined javascript
Regenerate licenses
|
2016-08-28 23:07:31 +02:00 |
|
|
FrancescoUK
|
375408a7a7
|
Amend COPYING license file
|
2016-08-28 12:39:00 +01:00 |
|
|
jekkos
|
7677c33ce1
|
Fix path to login.css (#624)
|
2016-08-25 17:38:56 +02:00 |
|
|
jekkos
|
e8a96054ee
|
Merge branch 'master' into feature/composer
Conflicts:
dist/opensourcepos.min.js
public/license/LICENSES
|
2016-08-24 16:25:55 +02:00 |
|
|
jekkos
|
dc0245c4fb
|
Merge branch 'feature/composer' of https://github.com/jekkos/opensourcepos into feature/composer
|
2016-08-23 18:28:50 +02:00 |
|
|
FrancescoUK
|
9a6bd6e000
|
Revert back bootstrap-select to version 1.10.0 (#813)
|
2016-08-19 18:54:41 +01: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
|
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
|
a6ba67e2fc
|
Change project layout for composer (#624)
|
2016-08-18 13:33:01 +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 |
|
|
jekkos
|
af6b323013
|
Fix build after rebase with master
Enable php socket extension in Dockerfile
|
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
|
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
|
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
|
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 |
|