Commit Graph

241 Commits

Author SHA1 Message Date
FrancescoUK
00f99c524a Updated LICENSE, upgraded js plugin and regen dist files 2017-03-13 14:38:27 +00:00
FrancescoUK
3f489d6f53 Fix payment issue (#1182) regen sql script files 2017-03-12 22:12:42 +00:00
FrancescoUK
78cb4822c2 Updated js plugins and composer 2017-02-11 20:51:32 +00:00
i92guboj
b373b1e07e Merge branch 'master' into pic_filename 2017-01-30 17:45:47 +01:00
FrancescoUK
a3c172624a Fix partial/header.php change 2017-01-29 17:09:00 +00:00
RamkrishnaMondal
5814bfc7e8 Third commit 2017-01-29 21:32:16 +05:30
RamkrishnaMondal
a627276265 First commit 2017-01-29 17:34:55 +05:30
i92guboj
6095577f47 ran grunt 2016-12-20 22:03:16 +01:00
i92guboj
c6e4584f71 Convert pic_id to pic_filename - db and csv files 2016-12-19 18:37:52 +01:00
jekkos
7d4dff0a37 Remove percentage sign from number_sorter regex (#1003) 2016-11-26 15:54:04 +01:00
jekkos
1ed76fa091 Properly parse negative numbers + rename currency_sorter (#1003) 2016-11-26 15:46:27 +01:00
jekkos
422e2ddbab Add currency sorting for summary reports (#1003) 2016-11-26 14:49:41 +01:00
FrancescoUK
35e76bdd4d Add value label on bars in bar/hbar charts 2016-11-15 18:41:17 +00:00
FrancescoUK
0e2f84c91d Update js plugins and regen dist files 2016-11-13 18:52:57 +00:00
jekkos
8217b70984 Fix debug mode + simplify Gruntfile 2016-10-06 22:12:33 +02:00
FrancescoUK
5a2bd9a569 Fix css and js broken URL issue (#624) 2016-10-02 09:41:23 +01:00
jekkos
86de36d731 Fix include paths for debug js + css 2016-10-02 00:19:46 +02:00
jekkos
592f378d2a Include fixes for GA Client, CI Email bug and bstables fix 2016-10-01 23:52:03 +02:00
FrancescoUK
974744858f Upgrade js plugins and regen dist files 2016-10-01 11:14:08 +01:00
FrancescoUK
3b00c5bf9e Updated js plugins and regen dist files 2016-09-15 22:28:49 +01:00
FrancescoUK
ea7cc16cc9 Regen dist files 2016-09-07 20:28:26 +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
jekkos
9e01ca2e43 Merge branch 'master' into feature/composer 2016-09-02 17:58:03 +02:00
jekkos
eb59079fe5 Regenerate sql scripts for hashing upgrade (#822) 2016-09-01 19:20:50 +02: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
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
d67b33d996 Reorder inlined javascript
Regenerate licenses
2016-08-28 23:07:31 +02: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
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
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
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
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
a0886caf2f Added all bootswatch themes and made theming configurable from config.php (#409) 2016-08-10 10:53:27 +01:00
FrancescoUK
fe5e99978c Upgrade always to the latest bootswatch flatly theme (provided is available on bootswatch-dist) 2016-08-04 21:45:25 +01:00
FrancescoUK
cbc42f7868 Upgraded to Bootstrap 3.3.7, dist file regen 2016-08-01 08:31:06 +01:00
jekkos
956f18e55c Round amount due before comparing with zero (#759)
Bump version chartist tooltip
2016-07-30 10:23:30 +02:00
jekkos
2519d0fb20 Don't send totals row to server for delete (#686)
Replace mysql with mariadb in docker images (#616)
2016-07-26 08:40:54 +02:00
FrancescoUK
a66868651b Update js plugins and regen dist files 2016-07-15 20:47:09 +01:00
FrancescoUK
86b32240d3 Adjusted login and header title line, updated spacelab footer.php 2016-07-10 10:30:44 +01:00
FrancescoUK
fbba5ea2c5 Reduced font size to 13px from 14px, regen dist files (#722) 2016-07-06 13:53:45 +01:00
FrancescoUK
81d1aa7873 Added partial/header_debug, upgraded grunt script, regen dist with updated js plugins 2016-07-05 19:13:27 +01:00