Commit Graph

2123 Commits

Author SHA1 Message Date
jekkos
feff5ff3f3 Set folder upload folder permissions to 755 (#1014)
Don't load item avatar if item_pic is empty
2017-01-29 17:19:00 +00:00
jekkos
0507db6a6f Set apache as owner of uploads folder (#1014) 2017-01-29 17:19:00 +00:00
jekkos
9b473e415d Hook standard jquery submit function and update csrf (#1019) 2017-01-29 17:19:00 +00:00
jekkos
47974074ee Stop running compose as travis seems to fail after startup? 2017-01-29 17:19:00 +00:00
jekkos
bc56ee54a3 Fix date, location and sale type filtering for summary payments (#1045) 2017-01-29 17:19:00 +00:00
jekkos
046a02d83c Refresh csrf tokens before submit (#1019) 2017-01-29 17:19:00 +00:00
mitchel
57e559e67b Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (22 of 22 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (26 of 26 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (66 of 66 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (89 of 89 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (12 of 12 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (84 of 84 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (117 of 117 strings)
2017-01-29 17:19:00 +00:00
jekkos
10e3ce9a9f Fix csrf refresh issue in register (#1019) 2017-01-29 17:19:00 +00:00
FrancescoUK
953fa534f4 Print just first letter of Employee family name to protect privacy (#1027) 2017-01-29 17:19:00 +00:00
FrancescoUK
c7982b9552 Bump OSPOS version to 3.0.2 2017-01-29 17:19:00 +00:00
FrancescoUK
6e0011b165 Fix Invoice Template editing issues (#1088), centre company name on top navbar 2017-01-29 17:15:46 +00:00
FrancescoUK
a3c172624a Fix partial/header.php change 2017-01-29 17:09:00 +00:00
FrancescoUK
3a81a712ff Fix LICENSE file 2017-01-29 16:57:47 +00:00
RamkrishnaMondal
775f40cb75 Merge pull request #8 from jekkos/master
Fix Detailed Receiving Report not showing Supplier (#1093)
2017-01-29 21:51:12 +05:30
RamkrishnaMondal
5814bfc7e8 Third commit 2017-01-29 21:32:16 +05:30
FrancescoUK
3f309298d8 Fix Detailed Receiving Report not showing Supplier (#1093) 2017-01-29 15:51:26 +00:00
RamkrishnaMondal
4ef8fc8df3 Second commit 2017-01-29 17:44:35 +05:30
RamkrishnaMondal
a627276265 First commit 2017-01-29 17:34:55 +05:30
RamkrishnaMondal
6e4155ccbb Merge pull request #7 from jekkos/master
update from upstream
2017-01-29 16:23:07 +05:30
jekkos
84ef147835 Bump PHP version to 7.0 2017-01-28 21:40:00 +01:00
jekkos
925bee2b0a Amend license file with copyright dates 2017-01-28 11:41:09 +01:00
FrancescoUK
680f2bb555 Bump version to 3.1.0 2017-01-27 18:37:09 +00:00
FrancescoUK
29920c5456 Bump version to 3.1.0 2017-01-27 18:36:34 +00:00
Steve Ireland
ace3bedbbc Correct typo 2017-01-22 20:53:43 -05:00
Steve Ireland
476db84e86 Change SUM to MAX and a couple of indent issues. 2017-01-22 16:40:20 -05:00
Steve Ireland
dc638c74b5 Resolves Item view and Takings view issues that odiea spotted. 2017-01-22 10:57:59 -05:00
jekkos
f04a2db4a5 Add ERD for sales diagram (for wiki page) 2017-01-22 11:18:19 +01:00
Steve Ireland
dd6bd1cf11 Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7 2017-01-21 23:26:01 -05:00
jekkos
4b1d5456cc Improve PHP7 compatibility (#591) 2017-01-21 00:01:59 +01:00
jekkos
4b85c14f00 Remove quirk in master (#1076) 2017-01-20 23:24:31 +01:00
Emin Tufan Çetin
9b33f39086 Translated using Weblate (Turkish)
Currently translated at 100.0% (84 of 84 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (61 of 61 strings)
2017-01-20 00:16:36 +01:00
mitchel
bebb9ca34b Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (61 of 61 strings)
2017-01-20 00:10:41 +01:00
jekkos
1dba07049c Enable jsPrint for custom receipt templates (#1070) 2017-01-19 23:54:30 +01:00
FrancescoUK
aae2d8ffc8 Update WHATS_NEW.txt with 3.0.2 improvements 3.0.2 2016-12-31 20:59:38 +00:00
FrancescoUK
a387a52578 Fix Summary Reports Payments (#1045) 2016-12-30 18:26:43 +00:00
jekkos
399b997fd0 Set folder upload folder permissions to 755 (#1014)
Don't load item avatar if item_pic is empty
2016-12-28 20:19:09 +01:00
jekkos
cb907ea303 Set apache as owner of uploads folder (#1014) 2016-12-28 18:36:16 +01:00
jekkos
744d166f58 Hook standard jquery submit function and update csrf (#1019) 2016-12-28 18:12:54 +01:00
jekkos
f3dd11e2c5 Stop running compose as travis seems to fail after startup? 2016-12-28 01:38:06 +01:00
jekkos
7f1c374e3d Fix date, location and sale type filtering for summary payments (#1045) 2016-12-28 01:30:21 +01:00
jekkos
80aba48240 Refresh csrf tokens before submit (#1019) 2016-12-28 01:24:47 +01:00
mitchel
a8bca7681d Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (22 of 22 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (26 of 26 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (66 of 66 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (89 of 89 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (12 of 12 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (84 of 84 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (117 of 117 strings)
2016-12-28 00:09:58 +01:00
jekkos
01e918e776 Fix csrf refresh issue in register (#1019) 2016-12-27 23:59:22 +01:00
i92guboj
6095577f47 ran grunt 2016-12-20 22:03:16 +01:00
i92guboj
06db967ee6 simplify code cause pic_thumb() always receives filename.ext 2016-12-20 20:46:00 +01:00
i92guboj
467ed586b1 indentation and revert func parameter experiment 2016-12-19 20:46:30 +01:00
i92guboj
74660bcaa1 migration script for already existing DBs 2016-12-19 20:19:05 +01:00
i92guboj
d9a4f93cfa pic_filename behavior and silent migration from pic_id 2016-12-19 20:18:05 +01:00
i92guboj
c6e4584f71 Convert pic_id to pic_filename - db and csv files 2016-12-19 18:37:52 +01:00
FrancescoUK
3a2dd7134f Print just first letter of Employee family name to protect privacy (#1027) 2016-12-05 19:22:38 +00:00