Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 1.1.5 #257

Merged
merged 45 commits into from
May 20, 2015
Merged

Release 1.1.5 #257

merged 45 commits into from
May 20, 2015

Conversation

mmclark
Copy link
Contributor

@mmclark mmclark commented May 20, 2015

No description provided.

axelstudios and others added 30 commits April 17, 2015 22:14
@axelstudios
Fixing typos
7544642
@axelstudios
Initial upload improvements
94bb4e9
@juliecov
issue #50 adding first and last buttons to lists
7666d3f
@juliecov
issue #50 adding first and last buttons to lists
1486614
@nicholasserra
Exact and empty matching on search fields.
3d4641d
@nllong
cleanup osx instructions
98a7a75
@mmclark
Merge pull request #208 from SEED-platform/issue_50_add_first_last_bu…
c2fcfcc 
…tton_lists

Issue 50 - add first and last buttons to lists
@mmclark
Merge pull request #212 from SEED-platform/20-filtering-exact-empty-q…
fa2af8a 
…ueries

Issue #20 - Exact and empty matching on search fields.
@mmclark
Merge branch 'osx-instructions' of https://github.com/NREL/seed into …
6db698a 
…NREL-osx-instructions

Conflicts:
	README-osx.md
@mmclark
Merge branch 'NREL-osx-instructions' into develop
062c9f2
@mmclark
Merge pull request #221 from SEED-platform/9-loading-indicator
9fa74d5 
Reopen: Issue #9 - Mapping page loading indicator
@axelstudios
Merge branch 'develop' into UploadErrorHandling
546eb18
@axelstudios
Adding error handling for specific failures
11632c7
@nicholasserra
Save building sort column and order in sessionStorage
c4c190a
@mmclark
Merge pull request #222 from SEED-platform/12-remember-settings
bf9329f 
Issue #12 - Save building sort column and order in sessionStorage
@mmclark
Merge pull request #224 from NREL/UploadErrorHandling
b55d984 
Upload error handling
@axelstudios
Fixing mixed tabs and spaces
dd29b2a
@mmclark
Revert "Upload error handling"
e125319
@mmclark
Merge pull request #229 from SEED-platform/revert-224-UploadErrorHand…
e340aab 
…ling

Revert "Upload error handling"
@axelstudios
Upload error handling via cache
e5e70d2
@nllong
add dump to gitignore
cd5ef87
@mmclark
merge fix tabs branch
eff8d00
@mmclark
Merge branch 'NREL-FixingMixedTabs' into develop
44edb4d
@axelstudios
Merge remote-tracking branch 'upstream/develop' into UploadErrorHandling
2e0ebd9 
Conflicts:
	seed/static/seed/partials/data_upload_modal.html
@mmclark
Merge pull request #230 from NREL/UploadErrorHandling
d2df0cc 
Upload error handling via cache
@philngo
add basic structure for showing green button files
0fb6fa7
@philngo
add green button xml files to get_ancestors, clean up partial
a437b36
@nicholasserra
JSON field exact and null searches
5f3412f
@philngo
add test for updated get_ancestors (through get_building endpoint)
e670014
@axelstudios
Making progress processing backwards-compatible until all progress en…
f550c99 
…dpoints have been updated.
nicholasserra and others added 15 commits May 12, 2015 16:54
@nicholasserra
Set filter params in sessionStorage
766dae3
@mmclark
Merge pull request #233 from SEED-platform/20-complex-filters
82a1ff2 
Issue 20 - JSON field exact and null searches
@mmclark
Merge pull request #234 from NREL/Issue232
ed8e23f 
Making the progress API backwards compatible
@mmclark
Merge pull request #235 from SEED-platform/12-remember-queries
6d9e312 
Issue #12 - Save building filter params in sessionStorage
@philngo
fix conflicts, indentation
deb34f0
@mmclark
Merge pull request #242 from SEED-platform/8-show-green-button-file
11153a2 
8 show green button file
@mmclark
Revert "Issue #12 - Save building filter params in sessionStorage"
10a0060
@mmclark
Merge pull request #253 from SEED-platform/revert-235-12-remember-que…
fc1981e 
…ries

Revert "Issue #12 - Save building filter params in sessionStorage"
@philngo
handle case in which the child node is not a source_type COMPOSITE_BS…
0044b10 
… node.
@philngo
Merge branch 'develop' of https://github.com/SEED-platform/seed into …
9f58990 
…8-show-green-button-file
@mmclark
Merge pull request #254 from SEED-platform/8-show-green-button-file
6010ae6 
8 show green button file
@mmclark
merge master
e2b631c
@mmclark
update version number to 1.1.5
f89ec38
@mmclark
Manual merge of loading indicator patches
9edbdbc
@mmclark
Merge pull request #256 from SEED-platform/dev-loading-indicator
56185ee 
Manual merge of loading indicator patches
mmclark added a commit that referenced this pull request May 20, 2015
@mmclark
Merge pull request #257 from SEED-platform/develop
004ebfe 
Release 1.1.5
@mmclark mmclark merged commit 004ebfe into master May 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mmclark @axelstudios @juliecov @nicholasserra @nllong @philngo