Commit Graph

139 Commits

Author SHA1 Message Date
4631489eba Changing card stats to month and adding runner up 2013-09-27 01:19:58 -07:00
e61ac5d32e Adding most active mac and runner up stats 2013-09-27 00:56:52 -07:00
3ddfb3442b Tabs with spaces 2013-09-25 21:45:12 -07:00
530f4834ca Changing user exit reason to fulltext 2013-09-24 23:14:50 -07:00
3c02724488 Fixing string comparison on member level 2013-09-23 23:55:16 -07:00
ec139a97a8 Separating certs into columns 2013-09-23 20:24:38 -07:00
c5e02a51be Making it possible for users to easily register existing MACs 2013-09-23 18:51:22 -07:00
cad46e45c5 Adding users without cards report, fixing mac registration for existing macs 2013-09-23 18:34:18 -07:00
377170d47c Adjusting sql for macs for postgres compatibility 2013-09-22 01:08:05 -07:00
df0e91c4ee Migrations and tweaks to facilitate sqlite-postgres switch 2013-09-22 00:50:41 -07:00
84525ca65f Updating email address 2013-09-21 02:38:03 -07:00
faaeb2b4a2 Allowing nil social media urls 2013-08-29 16:28:57 -07:00
c61b8ac8d4 Adding recent users report 2013-08-29 02:50:05 -07:00
8820dc4986 Adding activity and form fields for user profiles 2013-08-29 02:27:48 -07:00
37aba522cf Profile tweaks 2013-08-29 01:42:26 -07:00
d1ba469767 Adjusting profile display 2013-08-29 01:38:40 -07:00
f4868a32ae Social icons 2013-08-29 01:22:06 -07:00
880488c73e Adding social and exit reasons 2013-08-29 01:23:21 -07:00
2231d124a6 Style tweak and stats 2013-08-28 08:40:36 -07:00
accec4edb1 Merge branch 'csv'
Conflicts:
	app/models/user_certification.rb
	app/views/user_certifications/index.html.erb
	app/views/user_certifications/show.html.erb
2013-08-28 08:21:28 -07:00
25c0d1e1cb Finalized payments and CSVs and inactivity 2013-08-28 08:19:01 -07:00
e8e024c042 Adding CSV show 2013-08-28 05:14:10 -07:00
10a1e4eb84 Switching to RVM, View tweaks 2013-08-28 05:15:50 -07:00
211d79cbcd Adding csv import 2013-08-28 04:25:54 -07:00
69a57bc63b Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn 2013-08-28 03:19:09 -07:00
c662be6dc0 IPN improvements 2013-08-28 03:18:47 -07:00
ca7808a525 Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn 2013-08-27 23:06:43 -07:00
9fb2507aa1 Updating coin 2013-08-27 23:06:16 -07:00
0be2834a5d Minor status tweak 2013-08-27 00:39:43 -07:00
ef46bf6a98 Adjusting ranking method 2013-08-27 00:09:54 -07:00
45bac6cae4 Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn 2013-08-26 23:40:40 -07:00
4dba2b8c3d Adding status symbols 2013-08-26 23:39:54 -07:00
18bc427eb3 Adding quick-add buttons to user profiles 2013-08-26 23:01:43 -07:00
810ff6b034 De-duplicating cert view 2013-08-26 22:32:08 -07:00
ae031838dc Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn 2013-08-26 22:15:54 -07:00
59b6e3c838 Updating nav 2013-08-26 22:12:45 -07:00
98be42e9f9 Fixing nil errors 2013-08-26 22:11:04 -07:00
b5d9514914 Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn 2013-08-26 22:09:37 -07:00
125ad76a1c Hacks to allow 1.8.7 2013-08-26 22:07:41 -07:00
4067477cd4 Updating icons, fixing user cert nil error 2013-08-26 22:05:53 -07:00
9e4b79a353 Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn 2013-08-26 15:39:18 -07:00
f8f11e3d7e Adjust IPN security 2013-08-26 15:34:10 -07:00
805148ee40 Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn 2013-08-24 03:44:00 -07:00
f111769b20 Remove debug, update schema 2013-08-24 03:43:43 -07:00
eb782f11d5 Adding IPN validation 2013-08-24 03:40:34 -07:00
a1ef8a5fd5 User cert tweaks (handling nulls) 2013-08-24 02:23:12 -07:00
ec4cf4dea9 Adding IPNs 2013-08-24 02:18:37 -07:00
75e4907a9c Usability tweaks, creating merges, fixing issues 2013-05-23 23:25:09 -07:00
20a007cac5 Instructors can delete their own certs; hidden users are hidden in drop-downs; admins can see last user login; prepping for postgres 2013-05-03 00:16:02 -07:00
719b9447ab Merge branch 'pamela' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into pamela 2013-02-18 23:29:44 -07:00