 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 |
|
|
snipe
|
9122b49ecc
|
Merge pull request #984 from madd15/patch-2
Fix missing lists causing modal errors
|
2015-07-28 18:20:02 -07:00 |
|
|
madd15
|
35f97cceb7
|
Fix missing lists causing modal errors
|
2015-07-29 10:34:21 +09:30 |
|
|
snipe
|
6c3d9048cf
|
Merge pull request #982 from madd15/patch-4
Correct Asset Count
|
2015-07-28 16:57:17 -07:00 |
|
|
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 |
|
|
snipe
|
d235ae19dc
|
Merge pull request #968 from madd15/patch-3
Remove remnants of dataTables
|
2015-07-27 23:29:44 -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 |
|
|
madd15
|
ed02d7daae
|
Remove remnants of dataTables
|
2015-07-28 15:57:21 +09:30 |
|
|
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
|
b85e9bb97f
|
Add bootstrap extensions and export libs
|
2015-07-28 13:59:34 +09:30 |
|
|
madd15
|
5eedd7810f
|
Create bootstrap-table.js
|
2015-07-28 13:55:06 +09:30 |
|
|
madd15
|
1ba798a35d
|
Add bootstrap-table.css
|
2015-07-28 13:53:29 +09:30 |
|
|
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 |
|
|
snipe
|
66a198a175
|
Merge pull request #966 from madd15/patch-2
Request #961 - Clone button on license list view
|
2015-07-27 15:07:52 -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 |
|
|
snipe
|
c78355e39a
|
Cleaned up login screen layout
|
2015-07-26 21:58:03 -07:00 |
|
|
snipe
|
bc7c456f99
|
Added decline route
|
2015-07-26 21:22:28 -07:00 |
|
|
snipe
|
4f07818a2d
|
Only activate "email users" checkbox if there is an email address given for the user
|
2015-07-26 21:22:09 -07:00 |
|
|
snipe
|
979212b2ed
|
Sans serif in emails
|
2015-07-26 21:21:52 -07:00 |
|
|
snipe
|
b32e3a3475
|
Shwo username instead of email
|
2015-07-26 21:21:42 -07:00 |
|
|
snipe
|
67e18cb110
|
Updates for switch to username
|
2015-07-26 19:56:03 -07:00 |
|
|
Brady Wetherington
|
28304556a9
|
First pass at this, the ugly way. Just to see wha it looks like.
|
2015-07-26 18:15:06 -07:00 |
|
|
snipe
|
6a5777816c
|
Pulled extra route resources that weren't being used
|
2015-07-26 17:51:18 -07:00 |
|
|
snipe
|
2b2e6a8829
|
Additional localization strings
|
2015-07-25 00:20:17 -07:00 |
|