862 Commits

Author SHA1 Message Date
Godwin
f6e71c0c8a Fixed error loading select workshop table 2017-08-20 17:48:39 -07:00
Godwin
ad3136a5cb Schedule divisions and workshops table 2017-08-20 16:04:39 -07:00
Godwin
c1f9b5db82 Merge remote-tracking branch 'origin' into development 2017-08-19 18:44:22 -07:00
Godwin
c3591ba987 Fixed event editing 2017-08-19 18:43:59 -07:00
Godwin
800a095dcf Merge branch 'development' 2017-08-19 16:04:27 -07:00
Godwin
c2598aa47f Added 15 min intervals to workshop times 2017-08-19 16:04:06 -07:00
Godwin
93b74043fc Merge branch 'development' 2017-08-19 15:43:22 -07:00
Godwin
c21b36a94b Fixed notes alignment on scheduler 2017-08-19 15:43:00 -07:00
Godwin
bdb99b28d9 Merge branch 'development' 2017-08-19 13:47:36 -07:00
Godwin
41d272b70a Added schedule interval 2017-08-19 13:47:13 -07:00
Godwin
589c8e30ce Merge branch 'development' 2017-08-19 13:01:13 -07:00
Godwin
f36d9468df Scheduler UI improvements 2017-08-19 13:00:31 -07:00
Godwin
c2caab6885 Merge branch 'master' of https://github.com/bikebike/BikeBike 2017-08-19 08:36:02 -07:00
Godwin
a1d8989ac2 Merge branch 'development' 2017-08-19 08:35:40 -07:00
Godwin
e57bfb28e4 Deschedule workshops when blocks are removed 2017-08-19 08:35:18 -07:00
Godwin
0b49206e5a Merge pull request #261 from bikebike/development
Development
2017-08-18 12:09:12 -07:00
Godwin
b26d601cf9 Added missing admin strings 2017-08-18 12:08:31 -07:00
Godwin
d3f4bbe0ee Fixed error editing locations 2017-08-18 11:16:29 -07:00
Godwin
2f1ec5e1b5 Fixed error editing locations 2017-08-18 11:15:54 -07:00
Godwin
34564083a8 Added translation for admin error message 2017-08-18 10:52:31 -07:00
Godwin
3e4c91d07e Added translation for admin error message 2017-08-18 10:47:04 -07:00
Godwin
41b81e419f Merge branch 'development' 2017-08-17 07:10:59 -07:00
Godwin
32a7d88577 Merge branch 'master' of https://github.com/bikebike/BikeBike 2017-08-17 07:10:54 -07:00
Godwin
2f9ec913fc Merge branch 'development' of https://github.com/bikebike/BikeBike into development 2017-08-17 07:10:04 -07:00
Godwin
790204e3ed Added guest email addresses to host review page 2017-08-17 07:09:54 -07:00
Godwin
322e7481ac Added missing translation for schedule page 2017-08-16 09:59:16 -07:00
Godwin
2e74b9d427 Added missing translation for schedule page 2017-08-16 09:58:59 -07:00
Muz
740dc1b0d4 Don't extraneously include the hostname on links to workshops for emails 2017-08-15 11:45:07 -07:00
Muz
cc117540a1 Don't extraneously include the hostname on links to workshops for emails 2017-08-15 11:39:01 -07:00
Godwin
3635b02a65 Guest details for hosts 2017-08-14 19:44:12 -07:00
Godwin
c979faba78 Guest details for hosts 2017-08-14 19:40:43 -07:00
Godwin
651fb31b2a Merge branch 'development' 2017-08-13 11:22:02 -07:00
Godwin
b64c6ff2dc Merge branch 'development' of https://github.com/bikebike/BikeBike into development 2017-08-13 11:18:36 -07:00
Godwin
bb58acfb1c Added copy for admin block saved 2017-08-13 11:18:21 -07:00
Godwin
40d546c253 Development (#252)
* Fixed fonts

* Fixed assets

* Fixed logo in emails

* Switched to immediate email delivery

* Fixed prod emails and added deployment tasks

* Fixed deployments

* Updated README

* Added Bike Collectives Core to README

* Fixed issue with map loading

* Fixed issue with map loading

* Added map JSON data to assets precompilation

* Fixed error sending to conference administrators

* Let error report signature wrap

* Fixed backtrace in error reports

* Fixed backtrace in error reports

* Moved pronoun heading to make it more obvoius

I moved the "Pronoun" heading directly above the input field. It turned out that a lot of users were entering "He
 or "She" in the name field, I believe that was because of the placement of the "Pronoun" heading. I also needed to remove the optional warning but I'm hoping that won't cause problems.

* Added an error message when no email address is used on login

* Fixed select guest table

* Added house rules to housing admin and review

* Edit workshop locale warning

* Fixed workshop translation saving + ordered guests

* Fixed hguest sorting and workshop heading line height
2017-08-12 12:13:53 -07:00
Godwin
1aa08ada5a Merge branch 'master' into development 2017-08-12 12:13:28 -07:00
Godwin
9583d3c656 Merge branch 'development' of https://github.com/bikebike/BikeBike into development 2017-08-12 12:12:10 -07:00
Godwin
9b380e8de3 Fixed hguest sorting and workshop heading line height 2017-08-12 12:11:53 -07:00
Godwin
a6002d6c9a Development (#251)
* Fixed fonts

* Fixed assets

* Fixed logo in emails

* Switched to immediate email delivery

* Fixed prod emails and added deployment tasks

* Fixed deployments

* Updated README

* Added Bike Collectives Core to README

* Fixed issue with map loading

* Fixed issue with map loading

* Added map JSON data to assets precompilation

* Fixed error sending to conference administrators

* Let error report signature wrap

* Fixed backtrace in error reports

* Fixed backtrace in error reports

* Moved pronoun heading to make it more obvoius

I moved the "Pronoun" heading directly above the input field. It turned out that a lot of users were entering "He
 or "She" in the name field, I believe that was because of the placement of the "Pronoun" heading. I also needed to remove the optional warning but I'm hoping that won't cause problems.

* Added an error message when no email address is used on login

* Fixed select guest table

* Added house rules to housing admin and review

* Edit workshop locale warning

* Fixed workshop translation saving + ordered guests
2017-08-12 11:25:59 -07:00
Godwin
d336a7cc60 Merge branch 'master' into development 2017-08-12 11:25:48 -07:00
Godwin
d23c5034ed Fixed workshop translation saving + ordered guests 2017-08-12 11:07:49 -07:00
Godwin
f54c09f248 Development (#250)
* Fixed fonts

* Fixed assets

* Fixed logo in emails

* Switched to immediate email delivery

* Fixed prod emails and added deployment tasks

* Fixed deployments

* Updated README

* Added Bike Collectives Core to README

* Fixed issue with map loading

* Fixed issue with map loading

* Added map JSON data to assets precompilation

* Fixed error sending to conference administrators

* Let error report signature wrap

* Fixed backtrace in error reports

* Fixed backtrace in error reports

* Moved pronoun heading to make it more obvoius

I moved the "Pronoun" heading directly above the input field. It turned out that a lot of users were entering "He
 or "She" in the name field, I believe that was because of the placement of the "Pronoun" heading. I also needed to remove the optional warning but I'm hoping that won't cause problems.

* Added an error message when no email address is used on login

* Fixed select guest table

* Added house rules to housing admin and review

* Edit workshop locale warning
2017-08-06 09:41:13 -07:00
Godwin
b74b3062e8 Edit workshop locale warning 2017-08-06 08:50:39 -07:00
Godwin
2185129e55 Added house rules to housing admin and review 2017-08-05 19:19:46 -07:00
Godwin
365733ba6d Fixed select guest table 2017-08-03 21:55:57 -07:00
Godwin
4054f450fc Development (#249)
* Fixed fonts

* Fixed assets

* Fixed logo in emails

* Switched to immediate email delivery

* Fixed prod emails and added deployment tasks

* Fixed deployments

* Updated README

* Added Bike Collectives Core to README

* Fixed issue with map loading

* Fixed issue with map loading

* Added map JSON data to assets precompilation

* Fixed error sending to conference administrators

* Let error report signature wrap

* Fixed backtrace in error reports

* Fixed backtrace in error reports

* Moved pronoun heading to make it more obvoius

I moved the "Pronoun" heading directly above the input field. It turned out that a lot of users were entering "He
 or "She" in the name field, I believe that was because of the placement of the "Pronoun" heading. I also needed to remove the optional warning but I'm hoping that won't cause problems.

* Added an error message when no email address is used on login
2017-08-02 21:50:43 -07:00
Godwin
3da881bde4 Added an error message when no email address is used on login 2017-08-02 21:12:45 -07:00
Godwin
83f2558317 Development (#248)
* Fixed fonts

* Fixed assets

* Fixed logo in emails

* Switched to immediate email delivery

* Fixed prod emails and added deployment tasks

* Fixed deployments

* Updated README

* Added Bike Collectives Core to README

* Fixed issue with map loading

* Fixed issue with map loading

* Added map JSON data to assets precompilation

* Fixed error sending to conference administrators

* Let error report signature wrap

* Fixed backtrace in error reports

* Fixed backtrace in error reports

* Moved pronoun heading to make it more obvoius

I moved the "Pronoun" heading directly above the input field. It turned out that a lot of users were entering "He
 or "She" in the name field, I believe that was because of the placement of the "Pronoun" heading. I also needed to remove the optional warning but I'm hoping that won't cause problems.
2017-08-01 09:41:11 -07:00
Godwin
1cad5e99c8 Moved pronoun heading to make it more obvoius
I moved the "Pronoun" heading directly above the input field. It turned out that a lot of users were entering "He
 or "She" in the name field, I believe that was because of the placement of the "Pronoun" heading. I also needed to remove the optional warning but I'm hoping that won't cause problems.
2017-08-01 09:00:56 -07:00
Godwin
c96d8fafbb Fixed error redirecting to registration when trying to create a new workshop 2017-07-28 07:38:52 -07:00