Commit Graph

1716 Commits

Author SHA1 Message Date
madd15 a365cdc2cc Switch to new method 2015-08-25 16:34:51 +09:30
madd15 5aff3d9380 remove search explode 2015-08-18 16:17:46 +09:30
madd15 a1c6ea798a matching wording.....so damn picky :P 2015-08-18 16:15:41 +09:30
madd15 e0bf6ee390 Change to Bootstrap Table 2015-08-18 16:14:10 +09:30
madd15 93fe9a2799 Change to Bootstrap Table 2015-08-18 16:13:49 +09:30
madd15 611f59b507 Add name text search 2015-08-18 16:13:05 +09:30
madd15 899e543173 Switch to new method 2015-08-18 16:12:23 +09:30
madd15 5568f7fc5f Add name text search 2015-08-18 14:15:03 +09:30
madd15 d35f8e6244 Change to Bootstrap Table 2015-08-18 14:13:59 +09:30
madd15 6a2016685e Change to Bootstrap Table 2015-08-18 14:13:28 +09:30
madd15 567ad6c3bb Switch to new method 2015-08-18 14:11:03 +09:30
madd15 fd9cf29459 Additional changes for search and order functions 2015-08-07 09:44:23 +09:30
madd15 b9e3dd10b4 Additional Search and Order 2015-08-07 09:42:49 +09:30
madd15 0fcf33ed8c MOAR SEARCH 2015-07-30 15:22:58 +09:30
madd15 78e0af383d Fix user firstname/lastname search 2015-07-30 14:08:03 +09:30
madd15 032d79593a quick fix $inout/$action issue 2015-07-30 13:47:43 +09:30
madd15 f152841e81 quick fix $inout/$action issue 2015-07-30 13:46:59 +09:30
madd15 e66ea4dcd1 Build out search and add Model order scope 2015-07-30 13:45:46 +09:30
madd15 c513007b36 Add sort to table, missing most columns still 2015-07-30 13:44:32 +09:30
snipe 43af451709 Merge pull request #971 from madd15/patch-3
Small EOL fix if no value returned
2015-07-28 20:59:42 -07:00
madd15 35f97cceb7 Fix missing lists causing modal errors 2015-07-29 10:34:21 +09:30
madd15 2507c1aa70 Correct Asset Count 2015-07-29 09:26:44 +09:30
madd15 679b9f6def Small EOL fix 2015-07-28 17:03:39 +09:30
snipe 87cd77b4df Merge remote-tracking branch 'origin/2.0' into bootstrap-table-experiment
# Conflicts:
#	app/controllers/admin/AssetsController.php
2015-07-27 23:41:22 -07:00
snipe e4ad1011da Merge pull request #969 from snipe/inline_adding
Inline adding of dependent drop-down contents on asset-creation
2015-07-27 23:39:07 -07:00
Brady Wetherington de8180ec70 Abililty to inline-add things when you are creating a new asset 2015-07-27 23:27:45 -07:00
snipe 4af635df28 NEVERMIND. 2015-07-27 22:59:36 -07:00
snipe a6d4b30df8 Make checkall work 2015-07-27 22:50:01 -07:00
snipe 4a51ff9ba5 Duh 2015-07-27 22:46:13 -07:00
snipe 22be076504 More experiments 2015-07-27 22:39:47 -07:00
madd15 fc22c3884b Add bootstrap table js and css 2015-07-28 13:51:53 +09:30
madd15 0dc2a0ffac Change to bootstrap table compatable method 2015-07-28 13:50:48 +09:30
madd15 ae91f829e1 Change to bootstrap table compatable method 2015-07-28 13:50:10 +09:30
snipe 80145c699e One more because I have teh dumb and cannot brain today 2015-07-27 18:18:41 -07:00
snipe f99cafc101 Fix for 0000-00-00 purchase date 2015-07-27 17:16:28 -07:00
snipe 4014f5e15b Bug in purchase date 2015-07-27 17:11:46 -07:00
snipe fdb31ac19e Small tweaks to import script 2015-07-27 16:50:14 -07:00
snipe 9184dd5303 Fix for sad action column with button wrapping 2015-07-27 15:28:41 -07:00
snipe 26e081a2cb Fixes #909 again, because math is super hard 2015-07-27 15:26:53 -07:00
madd15 7aba5f3a84 Request #961 - Clone button on license list view 2015-07-28 07:33:51 +09:30
snipe 8d48fddac4 Merge pull request #956 from madd15/patch-1
Fix missing ]
2015-07-27 10:27:53 -07:00
snipe 8b5de894df Updated language files 2015-07-27 10:24:21 -07:00
snipe 5781a01311 Added English, Indonesian 2015-07-27 10:24:08 -07:00
snipe de1adf227b New language files 2015-07-27 10:18:40 -07:00
madd15 5e7bfe314a Fix missing ] 2015-07-27 21:20:19 +09:30
snipe 08ce08db62 Missing language strings for accept/decline 2015-07-26 23:01:31 -07:00
snipe 56504e07c9 More consistent language 2015-07-26 22:55:09 -07:00
snipe a901a648af Fixes #875 - allow user to decline asset and check asset back in if declined 2015-07-26 22:53:48 -07:00
snipe a099d16714 Only send email if an email address was given 2015-07-26 22:08:26 -07:00
snipe 464c83599b Nicer validation display on login screen 2015-07-26 22:01:45 -07:00