d71a02982d
Changes:
...
set new user create to active YES as default
Changed user password validation to 6-12 characters
Licenses controller removed asset_id from the INSERT column list
2014-08-05 13:36:47 +09:00
b8a4c7e4d6
Initial COMMIT to set the file modified tracking. No changes made.
2014-08-05 13:22:08 +09:00
8197e6174e
Fixes #200
2014-07-22 17:57:50 -04:00
3de929bb28
Merge pull request #199 from buzzedword/feature/gitignore-bin
...
Add bin directory to gitignore so vendor assets don't get committed.
2014-07-22 15:10:57 -04:00
f2036e0951
Merge pull request #197 from jarnokurlin/develop
...
user id 3 does not exists!
2014-07-22 14:54:42 -04:00
213e313e45
Add bin directory to gitignore so vendor assets don't get committed.
2014-07-22 14:52:08 -04:00
a695d8513c
Merge pull request #198 from buzzedword/feature/bug-58
...
Fixed #58
2014-07-22 14:24:02 -04:00
69fca5d1ed
Fixed #58
...
Added module scoping for all components, and stored lookups in event handlers instead
of querying live. Delays would erroniously cause values to persist.
2014-07-22 13:33:58 -04:00
94daba9bab
user id 3 does not exists!
2014-07-22 18:53:45 +03:00
56d619b218
Fixed missing language string
2014-07-19 18:10:10 -04:00
dc1033025a
Fixed #151 - more complete translations
2014-07-19 17:53:04 -04:00
a4b220d6c3
Fixed #191 - allow admins to assign a user during asset creation
2014-07-19 17:28:51 -04:00
a8c2955218
Updated changelog
2014-07-19 01:30:24 -04:00
03cd9f893c
Better asset dropdown to include user it's assigned to where applicable
2014-07-19 01:16:53 -04:00
4f04b96a13
Adding 5.6 back in
2014-07-18 23:55:44 -04:00
d2d85436ad
Tweaks to travis
2014-07-18 23:54:11 -04:00
85cd343bb6
Tried again - tweaking travis settings
2014-07-18 23:51:49 -04:00
6f6b98186e
NFC why this is suddenly failing :(
2014-07-18 23:48:43 -04:00
f855be45aa
Removed 5.6
2014-07-18 23:45:01 -04:00
ddf946ad5e
Tried to fix failing build caused by travis composer
2014-07-18 23:42:36 -04:00
4a13cded60
Fixed path for Travis composer
2014-07-18 23:40:57 -04:00
27e43eebcb
Added asset tag to license index view
2014-07-18 23:29:05 -04:00
196dbb856e
Merge remote-tracking branch 'origin/develop'
2014-07-18 23:25:48 -04:00
3d91a43554
Added asset tag to asset list
2014-07-18 23:25:33 -04:00
9df9371ffe
Merge remote-tracking branch 'origin/develop'
2014-07-18 20:25:12 -04:00
ca24ef1cd8
Merge branch 'refs/heads/feature/add-asset-to-software' into develop
...
Conflicts:
app/controllers/admin/LicensesController.php
2014-07-18 20:24:51 -04:00
ac4c905c42
Fixed #140
2014-07-18 20:09:58 -04:00
7f48ca04b0
Updated changelog
2014-07-17 14:01:04 -04:00
39fff92bdb
Updated changelog
2014-07-17 13:57:58 -04:00
43b98eff92
Merge remote-tracking branch 'origin/develop'
2014-07-17 13:54:10 -04:00
e203fc516f
Fixes #194
2014-07-17 13:51:58 -04:00
ff61705a8f
More edits for #140
2014-07-17 13:38:53 -04:00
aa8bbb88e9
Updated MVC for #140 , ability to assign software to asset (incomplete)
2014-07-17 08:33:30 -04:00
7d04ded02a
DB migration for #140
2014-07-17 08:32:11 -04:00
04ea0528a8
Merge remote-tracking branch 'origin/develop'
2014-07-16 18:21:42 -04:00
89000440f3
Added admin ability to unsuspend locked accounts #changelog
2014-07-16 18:21:22 -04:00
73b469621f
Merge remote-tracking branch 'origin/develop'
2014-07-13 07:35:28 -04:00
e94087d62b
Changed country to dropdown
2014-07-11 19:12:53 -04:00
21251b4623
Fixed #190 , where depreciation on licenses would not be saved
2014-07-09 21:12:58 -04:00
381f99543f
Merge remote-tracking branch 'origin/develop'
2014-07-09 11:58:47 -04:00
6f2b78ad9f
Added DB migration for #15
2014-07-09 11:50:54 -04:00
6043321bed
Added checkbox for marking an asset as requestable
2014-07-09 10:35:15 -04:00
03dffa3541
Added language string for requestable field
2014-07-09 10:34:54 -04:00
99003e126a
Fixed bug with edit (supplier_id), added requestable field for assets
2014-07-09 10:34:39 -04:00
82a84310ed
Added links to documentation and issues in footer
2014-07-09 08:45:11 -04:00
9dc40a3a9c
Fixed a few CSS quirks
2014-07-09 08:45:02 -04:00
784f7e8dec
WTF is wrong with me this morning? Hurr.
2014-07-09 07:08:15 -04:00
deb9f42ec8
Added gitbook.io badge
2014-07-09 07:07:22 -04:00
beb4d6500a
Added back the line separators
2014-07-09 07:05:47 -04:00
45fa66b41e
Updated copy
2014-07-09 07:03:10 -04:00
root