10198 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
snipe	6a8883104d	Fixed DB name in testing config	2016-04-12 19:23:40 -07:00
snipe	b6fa3a2a89	Added todos, fixed ID casing	2016-04-07 17:23:52 -07:00
snipe	40aac1bf89	Fixed seeds	2016-04-07 17:15:41 -07:00
snipe	4b168e8cfa	Fixes #1932 - disallow category delete if there are assets/accessories/etc	2016-04-07 17:15:30 -07:00
snipe	d601db2090	Updated docs	2016-04-07 17:08:38 -07:00
snipe	bf728da39d	Updated to use 5.2 trans() instead of Lang::get for localization	2016-04-07 13:39:35 -07:00
snipe	a62859dc6d	Updated docblocks	2016-04-07 13:21:09 -07:00
snipe	95e4845176	Fix userlist for accessory checkout	2016-04-07 05:03:14 -07:00
snipe	0e6b8a8358	Switch to use trans from Lang::get for laravel 5.2	2016-04-07 02:51:57 -07:00
snipe	64d36a9e64	Fixes #1922 - sort by license name	2016-04-04 22:16:24 -07:00
snipe	ecf9734105	Swtch env to just testing. ... This won't work, but neither does anything else	2016-03-30 18:31:09 -07:00
snipe	2e7ddb75db	Try diff block for testing (not testing-ci)	2016-03-30 15:56:53 -07:00
snipe	269944ecdf	Try adding phantom as the browser	2016-03-30 15:47:29 -07:00
snipe	4a7b0c0d0f	Updated docblocks	2016-03-28 22:51:49 -07:00
snipe	08c196872c	Removed IP test in custom fields since we are using laravel's IP validation now	2016-03-28 21:53:36 -07:00
snipe	093e4bbb73	Updated translations	2016-03-28 21:50:00 -07:00
snipe	6f9bad1005	Use lightbox for images in asset file listing	2016-03-25 20:38:27 -07:00
snipe	90d4a8b2e3	Cleanup namespaces a bit	2016-03-25 19:26:22 -07:00
snipe	e7405e8d89	Coding is still hard, apparently.	2016-03-25 18:51:44 -07:00
snipe	a10da2e148	Fixes error loading consumables	2016-03-25 18:29:45 -07:00
snipe	3f97cc0137	Fixes the fucking "Assets Retired" thing AGAIN.	2016-03-25 18:22:25 -07:00
snipe	41384dc62f	Fixes #1845 - remove ability for users to change their email and password	2016-03-25 18:20:57 -07:00
snipe	f1558706ff	Updated docblocks	2016-03-25 18:07:12 -07:00
snipe	46a76e2c55	More compact user code	2016-03-25 17:45:50 -07:00
snipe	bd1cb921fc	Nicer namespacing and lazy eager loading for 101 queries in location assets	2016-03-25 17:38:17 -07:00
snipe	2b74fd86cb	Trying to fix backup script ... This is still broken, but I will come back to it	2016-03-25 17:21:01 -07:00
snipe	95e2825716	A few more path fixes	2016-03-25 17:20:28 -07:00
snipe	e60bda0563	Updated file paths for uploads	2016-03-25 17:12:31 -07:00
snipe	bddb7fca23	Additional doc blocks, added private_uploads path	2016-03-25 15:50:08 -07:00
snipe	27543d16f6	Additional escaping	2016-03-25 15:24:12 -07:00
snipe	f1bdaeaf95	Escaped input on listing page	2016-03-25 14:24:27 -07:00
snipe	34536f29e9	Updated url with my local env SSL	2016-03-25 06:54:48 -07:00
snipe	4b9dc430c4	Escape data in datatables	2016-03-25 06:50:24 -07:00
snipe	753a7333f1	If the settings table is empty, set a default	2016-03-25 05:39:08 -07:00
snipe	a306574751	Check whether the login page even loads :(	2016-03-25 05:29:42 -07:00
snipe	f902e3b8ce	Another try fixing phantom	2016-03-25 05:21:45 -07:00
snipe	938e940366	Try to build phantom manually	2016-03-25 05:05:11 -07:00
snipe	5d3364c846	One more time	2016-03-25 04:54:01 -07:00
snipe	7c985ad495	Possible fix for travis (haha yeah right)	2016-03-25 04:48:26 -07:00
snipe	fb84ba2878	Add color picker just to settings	2016-03-25 04:18:01 -07:00
snipe	82d6a4e025	Fixed Asset namespace	2016-03-25 04:16:32 -07:00
snipe	46e003ce75	Replaced readme	2016-03-25 04:03:28 -07:00
snipe	eb95f5ca4f	Cleanup js and CSS elixir stuff	2016-03-25 03:36:37 -07:00
snipe	7ec109c4d8	Fixed slug helper	2016-03-25 03:32:35 -07:00
snipe	99dee751f3	Updated menu color for readability	2016-03-25 02:07:35 -07:00
snipe	aff133b5f1	Applied updates from PR for LDAP pagination	2016-03-25 01:38:10 -07:00
snipe	bd334076ca	Updated installer	2016-03-25 01:24:28 -07:00
snipe	fe00b0e401	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00