Commit Graph

894 Commits

Author SHA1 Message Date
Cordeos Team d482b1ea69 0.4.0 release candidate 2014-08-11 13:22:42 +09:00
Cordeos Team 8c7be8fbb3 0.4.0 release candidate 2014-08-11 13:15:08 +09:00
Cordeos Team 3944ebddf3 0.4.0 release candidate 2014-08-11 13:14:22 +09:00
Cordeos Team 6cfb4ab5d8 0.4.0 release candidate 2014-08-11 13:10:00 +09:00
Cordeos Team 64abdddccb Database migration update 2014-08-10 22:59:57 +09:00
Cordeos Team 23a64cfe26 Database migration update 2014-08-10 22:35:14 +09:00
Cordeos Team 448b54d8e2 DBUpdate 2014-08-10 22:08:38 +09:00
Cordeos Team 72671d3e1d initial beta .4 draft 2014-08-10 20:01:38 +09:00
Cordeos Team efbe7b0fee initial beta .4 draft 2014-08-10 19:58:23 +09:00
Cordeos Team af083570a0 initial beta .4 draft 2014-08-10 19:09:08 +09:00
Cordeos Team 87c2a4c9c0 initial commit 2014-08-10 16:42:40 +09:00
root cb8369e9de Initial QA Patch to fix errors
Add License
Add Asset
Show Deleted Users
License Assign
2014-08-08 00:03:12 +09:00
root 6c5bbec44e Changes:
Updated user create to make LOCATION required - same as user edit
Own account password change updated to require only 6-12 characters
2014-08-05 14:56:37 +09:00
root 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
root b8a4c7e4d6 Initial COMMIT to set the file modified tracking. No changes made. 2014-08-05 13:22:08 +09:00
snipe 8197e6174e Fixes #200 2014-07-22 17:57:50 -04:00
snipe 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
snipe f2036e0951 Merge pull request #197 from jarnokurlin/develop
user id 3 does not exists!
2014-07-22 14:54:42 -04:00
Danny Garcia 213e313e45 Add bin directory to gitignore so vendor assets don't get committed. 2014-07-22 14:52:08 -04:00
snipe a695d8513c Merge pull request #198 from buzzedword/feature/bug-58
Fixed #58
2014-07-22 14:24:02 -04:00
Danny Garcia 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
Jarno Kurlin 94daba9bab user id 3 does not exists! 2014-07-22 18:53:45 +03:00
snipe 56d619b218 Fixed missing language string 2014-07-19 18:10:10 -04:00
snipe dc1033025a Fixed #151 - more complete translations 2014-07-19 17:53:04 -04:00
snipe a4b220d6c3 Fixed #191 - allow admins to assign a user during asset creation 2014-07-19 17:28:51 -04:00
snipe a8c2955218 Updated changelog 2014-07-19 01:30:24 -04:00
snipe 03cd9f893c Better asset dropdown to include user it's assigned to where applicable v0.3.11-alpha 2014-07-19 01:16:53 -04:00
snipe 4f04b96a13 Adding 5.6 back in 2014-07-18 23:55:44 -04:00
snipe d2d85436ad Tweaks to travis 2014-07-18 23:54:11 -04:00
snipe 85cd343bb6 Tried again - tweaking travis settings 2014-07-18 23:51:49 -04:00
snipe 6f6b98186e NFC why this is suddenly failing :( 2014-07-18 23:48:43 -04:00
snipe f855be45aa Removed 5.6 2014-07-18 23:45:01 -04:00
snipe ddf946ad5e Tried to fix failing build caused by travis composer 2014-07-18 23:42:36 -04:00
snipe 4a13cded60 Fixed path for Travis composer 2014-07-18 23:40:57 -04:00
snipe 27e43eebcb Added asset tag to license index view 2014-07-18 23:29:05 -04:00
snipe 196dbb856e Merge remote-tracking branch 'origin/develop' 2014-07-18 23:25:48 -04:00
snipe 3d91a43554 Added asset tag to asset list 2014-07-18 23:25:33 -04:00
snipe 9df9371ffe Merge remote-tracking branch 'origin/develop' 2014-07-18 20:25:12 -04:00
snipe 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
snipe ac4c905c42 Fixed #140 2014-07-18 20:09:58 -04:00
snipe 7f48ca04b0 Updated changelog 2014-07-17 14:01:04 -04:00
snipe 39fff92bdb Updated changelog 2014-07-17 13:57:58 -04:00
snipe 43b98eff92 Merge remote-tracking branch 'origin/develop' v0.3.10-alpha 2014-07-17 13:54:10 -04:00
snipe e203fc516f Fixes #194 2014-07-17 13:51:58 -04:00
snipe ff61705a8f More edits for #140 2014-07-17 13:38:53 -04:00
snipe aa8bbb88e9 Updated MVC for #140, ability to assign software to asset (incomplete) 2014-07-17 08:33:30 -04:00
snipe 7d04ded02a DB migration for #140 2014-07-17 08:32:11 -04:00
snipe 04ea0528a8 Merge remote-tracking branch 'origin/develop' 2014-07-16 18:21:42 -04:00
snipe 89000440f3 Added admin ability to unsuspend locked accounts #changelog 2014-07-16 18:21:22 -04:00
snipe 73b469621f Merge remote-tracking branch 'origin/develop' 2014-07-13 07:35:28 -04:00