Commit Graph

897 Commits

Author SHA1 Message Date
snipe 2bae77b3af Removed extranneous text field 2015-02-09 16:50:12 -08:00
snipe c1600a33db Fixes #499 - timestamps in asset logs 2015-02-09 16:47:36 -08:00
snipe 7ed098de67 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2015-02-09 00:48:19 -08:00
snipe 22af5561b2 Updated translation strings 2015-02-09 00:48:03 -08:00
snipe 389c27b2e6 Fixes #477 - wrong sidebar on asset view 2015-02-09 00:34:29 -08:00
snipe d86b5aa613 Bumped version 2015-02-08 16:20:24 -08:00
snipe 42d5d8db80 Updated language files 2015-02-08 16:17:45 -08:00
snipe 614396a15b Utilize query scopes for cleaner controllers 2015-02-08 16:02:35 -08:00
snipe cfe0472ea2 New language strings for file uploads 2015-02-06 22:18:57 -08:00
snipe d20b5136b8 Nicer display if no files have been uploaded 2015-02-06 22:02:52 -08:00
snipe 29f5b7c5e3 Fixed datetime 2015-02-06 21:54:44 -08:00
snipe 140bd137a4 Minor display fixes 2015-02-06 21:54:36 -08:00
snipe 3a9cb9ba7a Display uploaded files 2015-02-06 21:31:16 -08:00
snipe 6d0828bfe5 Delete file interface and routes 2015-02-06 20:42:40 -08:00
snipe 51a7752771 Moved cancel text to buttons language file 2015-02-06 18:52:09 -08:00
snipe a8681225f5 Added language for add button 2015-02-06 18:46:20 -08:00
snipe 26a59afa44 Basic upload display and form 2015-02-06 18:43:15 -08:00
snipe e22ce0d377 Changes added_on to created_at 2015-02-06 18:43:04 -08:00
snipe 2fbef7f561 Updated field name for asset log 2015-02-06 18:42:48 -08:00
snipe 416cd236d2 Updated to new fieldname 2015-02-06 18:42:24 -08:00
snipe 4936a5914f Folder for private uploads 2015-02-06 18:41:56 -08:00
snipe 36fce27297 Added uploads methods 2015-02-06 18:41:47 -08:00
snipe 4b2e45c5f2 Added uploads methods 2015-02-06 18:41:35 -08:00
snipe 11f46474ab New file upload language 2015-02-06 18:41:24 -08:00
snipe b0d52a4158 Updated field name 2015-02-06 18:41:16 -08:00
snipe 7b4845c255 Added soft delete to asset log 2015-02-06 18:40:58 -08:00
snipe 223ba349ea Minor change to comment for clarify 2015-02-06 16:57:15 -08:00
snipe feeef4b66c Fix for asset log incorrectly using soft deletes 2015-02-06 14:54:13 -08:00
snipe 42f8a35078 Additional translation files 2015-02-05 17:08:20 -08:00
snipe c255edaf61 More travis fixes 2015-02-05 15:30:51 -08:00
snipe e67ba8a743 Fix reporting error on depreciation 2015-02-04 16:13:11 -08:00
snipe b4750f016d Added new 4.2 SoftDeletingTrait 2015-02-04 15:50:40 -08:00
snipe 7069d9c6b1 Added new cipher to config 2015-02-04 15:50:07 -08:00
snipe 8e0d774023 Added strict option in database config 2015-02-04 15:49:50 -08:00
snipe 394836821c Added catehory nav item in sidebar 2015-02-04 15:01:36 -08:00
snipe a1ac7f8676 Removed cruft 2015-02-04 15:01:08 -08:00
snipe cd338d2a70 Fixes #483 - line breaks in notes on view 2015-02-04 10:21:02 -08:00
snipe 4dc81ce65f Resolves #478 - redirects non-reporting users to view assets page 2015-02-04 09:31:01 -08:00
snipe f5efc368a5 Fixes #487 - maintained and purchase order in strict mode 2015-02-04 08:51:03 -08:00
snipe 1db806f8b2 Fixes #488 - longer user jobtitle 2015-02-04 07:59:45 -08:00
snipe b3af102d22 Fixed safe mode issue with license seeder 2015-02-04 07:49:28 -08:00
snipe 2b86f14e30 Possible fix for #484 - fullname issue 2015-02-01 14:33:58 -08:00
snipe a4bac03692 Increment version number 2015-01-23 15:38:48 -08:00
snipe 950567e9d6 Fixes issue related to #471 - assigning to user ID 0 causes erro 2015-01-23 15:38:39 -08:00
snipe 3787a3f4ba Fixed language strings for incrementing IDs 2015-01-22 15:34:19 -08:00
snipe 95141d49ba Fixes #432 - add model name to checkout 2015-01-22 15:20:16 -08:00
snipe d85e524680 Fixes #451 - allows spaces in state name 2015-01-22 14:29:53 -08:00
snipe 4a77dee79c Fixes #447 - added asset log entry on save 2015-01-22 14:16:09 -08:00
snipe 53085983f8 Added UK English language file 2015-01-22 13:24:01 -08:00
snipe 4a2ac03ace New Spanish strings 2015-01-22 13:23:29 -08:00