Warning: Can't synchronize with repository "(default)" (/home/git/ome.git does not appear to be a Git repository.). Look in the Trac log for more information.
- Timestamp:
-
02/22/12 08:47:52 (12 years ago)
- Author:
-
wmoore
- Comment:
-
Sorry, I should have been clearer. All the merges happened on top of develop. I've added to the graph above to show that. That's why it worked when building on my local machine. Just not sure what's going on with gretzky. Maybe I'll do a simpler merge without the new conn decorators and ajax_helpers.
Legend:
- Unmodified
- Added
- Removed
- Modified
-
- Property Owner changed from jmoore to wmoore
- Property Cc wmoore added
-
|
initial
|
v2
|
|
| 20 | 20 | * | | f5b0b5e First OmeroPy chgrp test. See #8006 |
| 21 | 21 | | * | fef2c6a (chris/6342_integration) The conn is already in the kwargs, adding it twice causes an exception. |
| | 22 | |
| | 23 | ... |
| | 24 | | * | 434ee38 Initial version of login_required() decorator. |
| | 25 | | * | 2d2e310 Merge branch 'rm_dbg_for_carlos' into 6342_integration_rebase |
| | 26 | | |\ \ |
| | 27 | * | \ \ 55b44ea (ola/7993_transition, 7993_transition) Merge remote-tracking branch 'origin/develop' into 7993_transition |
| | 28 | |\ \ \ \ |
| | 29 | | | * \ \ a1576e9 (ome/develop, develop) Merge pull request #82 from aleksandra-tarkowska/sprint8-web-backlog |
| | 30 | | | |\ \ \ |
| | 31 | | |/ / / / |
| | 32 | | | * | | bb8d1f1 (ola/sprint8-web-backlog) Merge remote-tracking branch 'origin/develop' into sprint8-web-backlog |
| | 33 | | | |\ \ \ |
| | 34 | | | |/ / / |
| | 35 | | |/| | | |
| | 36 | | | | | * 61b097a (gh/8008_ajax_helper, 8008_ajax_helper) Removing (now)-redundant ajax error handling |
| | 37 | | | | | * b01373c handler500 is_ajax returns HttpResponseServerError |
| 22 | 38 | |
| 23 | 39 | }}} |
1.3.13-PRO © 2008-2011
Agilo Software all
rights reserved
(this page was served in: 0.13231 sec.)
