0b1ea5dc49
Improved time fields.
2013-06-11 22:36:18 -07:00
fea09f80a1
Merge branch 'master' into develop
2013-06-11 18:37:56 -07:00
ed281d2cda
Autocomplete edit-form address field.
...
Also updated jquery-ui, and set requirejs to not time out.
2013-06-11 18:33:46 -07:00
9788ec097b
Fixed event owner gravatars and improved event-map seeding.
2013-06-11 17:52:52 -07:00
ccda7bb2d9
Merge pull request #5 from alicoding/bug881465
...
bug881465 - fix mixed content Google Map
2013-06-11 15:37:38 -07:00
e98e3c54ef
remove extraneous console.log calls
2013-06-11 15:27:10 -07:00
7459a390c5
minor event-details view changes
2013-06-11 14:57:41 -07:00
31109d673a
Replaced 'nox' component of noxmox with knox.
2013-06-11 14:30:16 -07:00
e755e943b9
Added noxmox to package.json dep list.
2013-06-11 14:14:26 -07:00
7a2be17420
fixed typo in events#create controller action
2013-06-11 13:46:17 -07:00
d5d10b390a
removed 'gallery()' from events/layout.html
2013-06-11 13:43:59 -07:00
118a242f25
renamed s3 env-var from S3_PREFIX->S3_LOCAL for local storage
2013-06-11 13:31:11 -07:00
41f0c248e8
Let Owners edit their Events in details-view
...
Resolved ticket #876997 (https://bugzilla.mozilla.org/show_bug.cgi?id=876997 ).
2013-06-11 13:23:38 -07:00
c4f5563091
bug881465 - fix mixed content Google Map
2013-06-11 15:15:18 -04:00
ce49addade
Re-added webmakerId to event model.
2013-06-10 14:46:25 -07:00
1ef97189fa
fixed minor url concat issue with s3
2013-06-10 14:02:36 -07:00
be7e722bd4
Fixed S3 mox url issue.
2013-06-10 13:57:40 -07:00
d87666f405
minor fixes
2013-06-10 04:20:32 -07:00
cf8c2b670b
Fixed image upload to S3, added basic event-create validation, and minor UI tweaks.
2013-06-10 03:51:28 -07:00
ba18eda911
added domReady module, loaded main js component, misc cleanup
2013-06-09 20:42:51 -07:00
fc7ca8c380
made event-creeate form description box smaller.
2013-06-08 19:08:43 -07:00
5fcbc7a595
misc form style improvements
2013-06-08 15:44:41 -07:00
acf02a5421
Replaced datepicker with customized version (bundled into jquery-ui).
2013-06-08 14:18:22 -07:00
b9545326c8
Added timepicker widget, and improved calendar styling.
2013-06-08 11:37:21 -07:00
7b55ee8a57
Removed jQuery-ui timespinner element, and misc style cleanup.
2013-06-08 06:37:33 -07:00
3faf81d4b4
Merge branch 'develop' into form-ui-widgets
...
Conflicts:
assets/css/event_create.less
assets/css/events.less
static/js/events/forms.js
static/js/events/index.js
views/events/map.html
2013-06-07 14:51:40 -07:00
1651010731
Removing extraneous sequelize symlink (add ./node_modules/.bin to PATH instead).
2013-06-07 14:25:13 -07:00
6ef4481fc2
minor stylistics changes to facilitate future merges
2013-06-07 14:11:23 -07:00
995b49b03f
Merge branch 'event-details-edit' into s3-image-upload
...
Conflicts:
static/js/events/map/forms.js
2013-06-07 14:08:41 -07:00
3574da8c1a
added jquery-form plugin for ajax form uploads
2013-06-07 13:09:07 -07:00
03d240edc3
further s3 integration and misc controller cleanup
2013-06-07 13:07:57 -07:00
8a486a5d98
ORM simplifications and cleanup.
2013-06-07 13:05:27 -07:00
8f8c84102b
Merge branch 'develop' into s3-image-upload
...
Conflicts:
config/orm.js
2013-06-07 05:24:03 -07:00
a197742811
Added S3-configuration loader, and moved common mechanisms out of config/orm.js
2013-06-07 05:14:02 -07:00
1db37c5ad9
Added markdown editor for events-create form description field, and misc UI cleanup.
...
Conflicts:
assets/css/event_create.less
assets/css/events.less
static/js/events/index.js
static/js/events/map/forms.js
views/events/map.html
2013-06-07 00:17:32 -07:00
52e81f270d
Added conditional 'edit' and 'delete' buttons to event-details page.
2013-06-06 19:25:18 -07:00
acf2339dcc
Added markdown editor for events-create form description field, and misc UI cleanup.
2013-06-06 19:23:04 -07:00
406eb7177a
Merge pull request #2 from mjschranz/sequelizeSQLITE
...
This adds some support for sqlite usage with Sequelize. This way for local development we can opt to use sqlite and not be forced to keep a mysql server running.
2013-06-06 14:38:21 -07:00
0f28e4d356
Add support for sqlite so local dev can be done easier
2013-06-06 17:32:28 -04:00
7525e0a172
Added env-var db config option.
2013-06-06 13:51:50 -07:00
4fc4933182
Restore zoom in/out in google maps.
...
Resolves ticket #877410 (https://bugzilla.mozilla.org/show_bug.cgi?id=877410 ).
2013-06-06 12:54:06 -07:00
770fb29ab7
Fix non-JS event-create form submission.
...
Resolves ticket #877011 (https://bugzilla.mozilla.org/show_bug.cgi?id=877011 ).
2013-06-06 12:37:52 -07:00
f6ad2f8ec7
Initial attempt at adding enhanced date/time/select elements.
...
Using webmaker.org's UI library for 'select', and jQuery-UI for date/time.
2013-06-06 12:24:08 -07:00
40432cb951
further controller middleware cleanup
2013-06-06 12:03:14 -07:00
eb09ae6dc9
Minor reorganization of client-side js.
2013-06-05 22:42:14 -07:00
60111c1f18
Fixed drag/drop in Event-creation form.
...
Resolves ticket #877022 (https://bugzilla.mozilla.org/show_bug.cgi?id=877022 ).
2013-06-05 21:22:37 -07:00
710eea5f70
scroll map window up after loading
2013-06-05 21:22:21 -07:00
07511b36e7
Simplified controller and route helper functions.
2013-06-05 21:21:05 -07:00
8cc74d32e0
removed less-middleware and connect-assets from package.json deps
2013-06-05 18:13:49 -07:00
f87ef4406c
updated package.json git-repo url
2013-06-05 18:12:50 -07:00
Hike Danakian
alicoding
Matthew Schranz