 snipe
|
d541ded862
|
Merge remote-tracking branch 'origin/develop'
Conflicts:
app/views/backend/layouts/default.blade.php
|
2015-02-10 19:47:43 -08:00 |
|
|
snipe
|
8cc95a3b9b
|
Merge pull request #507 from madd15/patch-2
Added Archived Lang
|
2015-02-10 19:19:03 -08:00 |
|
|
snipe
|
bf9a825095
|
Removed extraneous ID
|
2015-02-10 19:18:15 -08:00 |
|
|
madd15
|
5c92be5190
|
Added Archived Lang
|
2015-02-11 13:45:04 +10:30 |
|
|
madd15
|
fa9cf35ff5
|
Added Archived Lang
|
2015-02-11 13:43:19 +10:30 |
|
|
snipe
|
f36029a34a
|
Fixed migration for to set assigned_to to null per #506
|
2015-02-10 18:41:45 -08:00 |
|
|
snipe
|
c2e532e32e
|
Fixed language file for status label messages
|
2015-02-10 18:33:19 -08:00 |
|
|
snipe
|
9bcc9a7ed1
|
Check not deleted
|
2015-02-10 18:27:00 -08:00 |
|
|
snipe
|
7715731c4a
|
Fix count in header
|
2015-02-10 18:26:35 -08:00 |
|
|
snipe
|
a2178392e6
|
Fixed seeder
|
2015-02-10 18:09:36 -08:00 |
|
|
snipe
|
0aa4d2a3db
|
Added undeployable as allowed validation type
|
2015-02-10 18:06:55 -08:00 |
|
|
snipe
|
5867c60410
|
Fixed scope chaining on assigned_to
|
2015-02-10 17:58:47 -08:00 |
|
|
snipe
|
268fb98dbb
|
Indented for better readibility
|
2015-02-10 17:41:42 -08:00 |
|
|
snipe
|
5f1227d0fa
|
Removed stray chars
|
2015-02-10 17:41:27 -08:00 |
|
|
snipe
|
1b93c5538a
|
Get trashed for admins
|
2015-02-10 17:41:19 -08:00 |
|
|
snipe
|
3645f85731
|
Typo :(
|
2015-02-10 17:23:25 -08:00 |
|
|
snipe
|
0b02b1631b
|
Merge pull request #505 from madd15/patch-1
Fix RTD query to not display checked out asset
|
2015-02-10 17:20:20 -08:00 |
|
|
madd15
|
31f4ba88f6
|
Fix RTD query to not display checked out asset
|
2015-02-11 11:49:28 +10:30 |
|
|
snipe
|
c06a4d4118
|
Fixed wonky checkin/checkout buttons
|
2015-02-10 17:17:33 -08:00 |
|
|
snipe
|
dbc93de6b3
|
Fixes checkin button on view
v1.2.4-beta
|
2015-02-10 17:11:40 -08:00 |
|
|
snipe
|
2277b6ee69
|
Fixed checkout logic for new assigned_to
|
2015-02-10 17:04:15 -08:00 |
|
|
snipe
|
b36d73a4bb
|
Missing checkin buttons on index
|
2015-02-10 17:03:13 -08:00 |
|
|
snipe
|
283d2855d7
|
Added user_id to status label migration for strict mode
|
2015-02-10 16:22:02 -08:00 |
|
|
snipe
|
f175f52530
|
Fixed spacer in sidenav for list all
|
2015-02-10 16:08:54 -08:00 |
|
|
snipe
|
e29da5521d
|
Moved location of archived link
|
2015-02-10 16:08:02 -08:00 |
|
|
snipe
|
1db1819a56
|
Added Archived as view for filter
|
2015-02-10 16:06:33 -08:00 |
|
|
snipe
|
aef3a734a3
|
Small fix for pending status
|
2015-02-10 16:06:24 -08:00 |
|
|
snipe
|
d2438f9fdb
|
Fixes #502 - normalized statuses
|
2015-02-10 15:57:19 -08:00 |
|
|
snipe
|
53d000e2d0
|
Migration to correct previous assigned_to=0 issue
|
2015-02-09 20:29:48 -08:00 |
|
|
snipe
|
addfcd4bc5
|
Fix RTD bug
|
2015-02-09 20:02:40 -08:00 |
|
|
snipe
|
b360736b77
|
Fixes #484
|
2015-02-09 19:26:57 -08:00 |
|
|
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
|
5d3b84e01a
|
Misc additional assets
|
2015-02-09 16:45:01 -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
|
7009b24748
|
Merge pull request #498 from snipe/fixes/477
Fixes #477 - wrong sidebar on asset view
|
2015-02-09 00:35:04 -08:00 |
|
|
snipe
|
389c27b2e6
|
Fixes #477 - wrong sidebar on asset view
|
2015-02-09 00:34:29 -08:00 |
|
|
snipe
|
a61e913824
|
Squashed commit of the following:
commit 95ae26eb2a
Author: snipe <snipe@snipe.net>
Date: Sun Feb 8 16:21:33 2015 -0800
Updated docs location
commit cfebe11755
Author: snipe <snipe@snipe.net>
Date: Sun Feb 8 16:20:36 2015 -0800
Updated docs for 4.2
commit d86b5aa613
Author: snipe <snipe@snipe.net>
Date: Sun Feb 8 16:20:24 2015 -0800
Bumped version
v1.2.3
|
2015-02-08 16:22:12 -08:00 |
|
|
snipe
|
95ae26eb2a
|
Updated docs location
|
2015-02-08 16:21:33 -08:00 |
|
|
snipe
|
cfebe11755
|
Updated docs for 4.2
|
2015-02-08 16:20:36 -08:00 |
|
|
snipe
|
d86b5aa613
|
Bumped version
|
2015-02-08 16:20:24 -08:00 |
|
|
snipe
|
c255de7fc0
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-08 16:18:09 -08:00 |
|
|
snipe
|
42d5d8db80
|
Updated language files
|
2015-02-08 16:17:45 -08:00 |
|
|
snipe
|
91bf9763d2
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-08 16:13:25 -08:00 |
|
|
snipe
|
9c66dd5431
|
Added gitignore
|
2015-02-08 16:13:10 -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
v1.2.3-beta
|
2015-02-06 22:02:52 -08:00 |
|
|
snipe
|
29f5b7c5e3
|
Fixed datetime
|
2015-02-06 21:54:44 -08:00 |
|