Commit graph

17 commits

Author SHA1 Message Date
Robert Sparks b0ce25aa44 clean merge forward
- Legacy-Id: 9584
2015-04-27 20:24:40 +00:00
Robert Sparks 61a0059d06 checkpoint before trying to fix the static agenda page
- Legacy-Id: 8972
2015-02-04 20:47:40 +00:00
Ole Laursen e78637b9fc Remove non-facelift static assets, and move the facelift assets one step up
- Legacy-Id: 8971
2015-02-04 17:03:43 +00:00
Ole Laursen 756a972113 Move meeting agenda editing over to new facelifted base template, although without actually facelifting the contents
- Legacy-Id: 8946
2015-01-29 17:53:56 +00:00
Robert Sparks a12be8aeb5 Removes a modify-while-iterating error, and removes a bug where two different bits of code thought they were responsible for deleting things from a global list. Fixes bug #1498. Commit ready for merge.
- Legacy-Id: 8377
2014-10-06 21:40:54 +00:00
Robert Sparks fc512680d8 From mcr@sandelman.ca:
Refactor to remove dajaxice.
  Modified the URLs that address schedules:
    - urls now always start with /agenda, removing the mix of /agenda and /schedule prefixes
    - urls to a given schedule include the schedule owner (by email address)
  Corrected issue that prevented deleting sessions.
  Changed comment mechanism in timeslot_edit.js
  Migration to change the email address for (System)

  Fixes bug #1426

Commit ready to merge
 - Legacy-Id: 8229
2014-07-31 22:13:01 +00:00
Robert Sparks 7b9e6b5609 Addresses issue with dragging and dropping unscheduled items back into the unscheduled bin (primary fix provided by Matt Miller). Fixes bug 1386. Commit ready for merge.
- Legacy-Id: 7865
2014-06-06 20:14:25 +00:00
Robert Sparks f92221a746 Revert a debug setting that should not have made it into the last commit. Commit ready for merge.
- Legacy-Id: 7733
2014-05-12 19:40:01 +00:00
Robert Sparks 947f174e78 Extended ScheduledSession objects were not initialized correctly, so un-extending did not work. Fixes bug #1401. Commit ready for merge.
- Legacy-Id: 7732
2014-05-12 19:37:44 +00:00
Robert Sparks b8cfbf18e5 From rjsparks@nostrum.com:
-  Fixed layout issue on schedule editing page in Chrome
  -  Fixed errant display of text in unscheduled group bar
     on the schedule editing page
  -  Changed the instruction text on the special requests
     field of the session request form

From rcross@amsl.com:
  - Improved scheduling of non-session items
  - Fixed issue with layout of the new notifications page
  - Fixed crash on notifications page
 - Legacy-Id: 7644
2014-04-25 14:44:40 +00:00
Robert Sparks 53feb01d67 Have group conflicts showing now - not sure find-free is working yet
- Legacy-Id: 7551
2014-03-27 19:47:31 +00:00
Robert Sparks e953538543 checkpoint before refactoring the conflict array
- Legacy-Id: 7548
2014-03-27 15:00:14 +00:00
Robert Sparks 5cdfe6adbf reasonably complete merge, but some of the newer-style tests are failing because the js API changed
- Legacy-Id: 7188
2014-01-31 01:13:53 +00:00
Ole Laursen f8b1568c87 Rewrite meeting PUTs to POSTs. For no apparent reason, parts of the
meeting AJAX code is using PUT instead of POST (even if it's not
PUT'ing in the literal sense but POST'ing). Theoretical discussions
aside, Django has poor support for PUTs turned POSTs so rewriting them
removes the need for a couple of hacks, and makes it easier to test.
 - Legacy-Id: 7067
2013-12-24 15:13:33 +00:00
Ole Laursen 66f3832f25 Fix syntax error in agenda JS
- Legacy-Id: 7019
2013-12-19 16:50:13 +00:00
Henrik Levkowetz a7838d8765 Cleanup action: replaced screaming html id with non-screaming version;
replaced the noTable block construct with start/end table_content blocks
in order to not have to open and close tables in different blocks, and
not have empty tables lying about.
 - Legacy-Id: 6439
2013-10-13 21:09:32 +00:00
Henrik Levkowetz a3c8adfdf6 Merged in the contents of commit [6337] from mcr@sandelman.ca, with some changes to take out dead code that inadvertently came back in.
- Legacy-Id: 6344
Note: SVN reference [6337] has been migrated to Git commit d0d1d949a9328da6c4e30d8f5e0d14ffb204e678
2013-10-02 21:53:28 +00:00