Commit Graph

206 Commits

Author SHA1 Message Date
2c4cd4a020 Mooooore resources 2014-02-09 05:01:52 -07:00
a2cbcac798 More resource tweaks 2014-02-09 04:32:45 -07:00
23dcb0715c More resource adding 2014-02-09 03:42:17 -07:00
e61895d20f Chmod 2014-02-09 02:09:03 -07:00
58926cf3ab Updating resources 2014-02-09 02:08:08 -07:00
e16e35e098 Massive chmod/chown 2014-02-09 00:56:48 -07:00
1d0e8721e1 Adding resources (imported from old toolshare) 2014-02-09 00:54:03 -07:00
56450cf319 Adding postal code to users 2014-02-08 21:06:07 -07:00
73833dd2bf Updating door log key
Adding reboot logging
2014-01-31 18:41:52 -07:00
c6bb164f73 Fixing MAC form and index 2014-01-24 04:27:21 -07:00
aa29f30f30 Allowing users to see member activity 2014-01-23 17:50:00 -07:00
a2a9d082d8 Adding json formats to space api access 2014-01-21 19:38:11 -07:00
8060f76cca Adjusting icon and adding meta tag for icon 2013-12-29 22:28:54 -07:00
6157280655 Changing door access tablet interface 2013-12-29 21:56:47 -07:00
cbadcc5c73 Fixing user-emailing abilities 2013-12-13 03:34:52 -07:00
ef590793f2 Card upload would fail due to being logged out halfway thru; changed arduino auth mechanism 2013-12-03 01:42:08 -07:00
41a8431be5 Adding direct door access commands and interface 2013-12-02 02:03:40 -07:00
d2434be109 Moving spaceapi endpoint and OAC door status checking here 2013-12-01 19:32:08 -07:00
02b997b838 Adding mac history graph 2013-10-26 03:22:03 -07:00
d88abe7d32 Whups, integer error in text email causing signup failures 2013-10-22 01:38:57 -07:00
0d1894d6e8 Updating payment and front page status alerts to work properly 2013-10-10 20:58:19 -07:00
008ceaed9e Updating emailer 2013-10-06 05:51:41 -07:00
15836b4f4e Adding zombie report 2013-10-06 05:17:24 -07:00
57e6ac1fc5 Adding user email feature 2013-10-06 04:09:56 -07:00
04bab84293 Adding new member report 2013-10-05 19:53:31 -07:00
d61289abaf Adding analytics, adjusting door log issues 2013-10-04 02:59:41 -07:00
75da7ffb6a Wording on graph 2013-10-02 05:01:30 -07:00
0eeaddabd7 Adjusting wording and stat counts 2013-10-02 04:57:46 -07:00
370c82e075 Wording 2013-10-02 04:46:35 -07:00
7f7cd6e9ff Adjusting wording, styling, and graph visibility 2013-10-02 04:45:07 -07:00
f11d5ebe1e Adding individual statistics/data-dumps 2013-10-02 04:31:10 -07:00
4da2ec9463 Tweaking main page stats to show member counts 2013-09-28 20:17:38 -07:00
7cd33ff030 Also cancan issue in mac controller 2013-09-28 19:36:23 -07:00
7bfd45a163 Added more_info notice and fixed payments cancan bug 2013-09-28 19:34:08 -07:00
42679aa410 Updating settings & fixing auth of objects through other objects cancan bug? 2013-09-28 19:31:28 -07:00
9e08a0d036 Updated stats and privacy 2013-09-28 18:55:22 -07:00
2c204a8f9d Adding wysiwyg and settings 2013-09-28 04:59:19 -07:00
b267da7b37 Style 2013-09-28 04:18:52 -07:00
ec84d8f5e0 Button style 2013-09-28 04:13:21 -07:00
e002907da7 Fixed graph 2013-09-28 04:12:43 -07:00
5acb3cd272 Updating payment graph 2013-09-28 03:33:36 -07:00
16e5e8d584 Adding payment graph 2013-09-28 02:42:30 -07:00
d1985dae12 Adding payment stats 2013-09-28 01:30:52 -07:00
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
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
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
c662be6dc0 IPN improvements 2013-08-28 03:18:47 -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
f8f11e3d7e Adjust IPN security 2013-08-26 15:34:10 -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
8a7fe29f6d Changing lapsed member math to be more accurate & give more info 2013-02-18 23:29:06 -07:00
e630c81298 Resolving nil error for access cards / logs 2013-02-14 23:00:01 -07:00
cefd4b3878 Added nice front page stuff, fixing sqlite issues, adding user payments to profiles 2013-02-14 00:29:22 -07:00
ed75ea0e90 Adding payments 2013-02-12 01:58:17 -07:00
3fb774d057 Adding note to macs json feed 2013-02-09 05:05:06 -07:00
0ced399651 Adjusted profile page to make avatar more clear 2013-02-09 04:21:42 -07:00
02920837e2 Updated new user email to include survey and link to user 2013-02-09 04:11:58 -07:00
63913c0be3 Forgot migration from previous commit. Also added links to home page 2013-02-09 04:01:21 -07:00
ac66cb0cbe Added "how did you hear about us" to user. 2013-02-09 03:47:07 -07:00
1f63709887 Reporting door access logs on each card's page; also card access stats for last 7 days 2013-02-09 03:32:26 -07:00
3f3eb1ed65 Allowed admins to see hidden users, added "no orientation" message to main page and hid new people from non-oriented people 2013-02-09 02:51:35 -07:00
f1b752a4c4 Updating homepage to display cooler door/mac stats 2013-02-09 02:40:38 -07:00
2d0735e914 Replaced "authok" with "ok" on OAC-Ethernet API, changing to match 2013-02-09 02:08:43 -07:00
d156edd683 Updating how macs are stored/viewed 2013-02-09 02:08:29 -07:00
1b64a6b931 Changing email to 2013-02-01 05:03:18 -07:00