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

Reset to upstream #1

Merged
merged 201 commits into from
Jun 22, 2016
Merged

Reset to upstream #1

merged 201 commits into from
Jun 22, 2016

Conversation

JonathanPorta
Copy link
Owner

No description provided.

DavidSouther and others added 30 commits November 14, 2015 10:22
@DavidSouther
Do not merge the same story.
2fef6d5
@DavidSouther
Actually handle replacing, not merging, records.
f674241
@DavidSouther
Try to replace tapes, when possible.
bbcab30
@gah-boh
Merge pull request #4 from DavidSouther/bug/dupe_stories
f8cdf79 
Do not duplicate stories when saving a tape.
@gah-boh
Search UI will handle dates for queries.
351dac4
@gah-boh
Pasing the correct parameters to the service for search.
0015379
@gah-boh
Search client service, not exporting unnecessary things.
1379c2f
@gah-boh
Chore: removing extra whitespace.
c4d64e4
@DavidSouther
Merge pull request #7 from PronghornDigital/search-dates
19c6322 
Search UI will handle dates for queries.
@JonathanPorta
Fix database not being read at startup
c4e40a3
Some layout improvements, breaking start and end dates into explicit …
8ecb2e3 
…fields that can be manually set by the user.
@JonathanPorta
Add some basic logging on error
c0d81d8
@DavidSouther
Merge pull request #6 from JonathanPorta/defect/db_eraser
54fc76f 
Fix database read error causes overwrite on start
@DavidSouther
Merge branch 'update-datetime-fields' of https://github.com/mrandre/M…
20153c7 
…ontana-News-Archive into merge/mrandre/update-datetime-fields
Some layout improvements, breaking start and end dates into explicit …
f91c296 
…fields that can be manually set by the user.
@DavidSouther
Expand first/last dates.
9b792fd
@DavidSouther
Merge branch 'update-datetime-fields' of https://github.com/mrandre/M…
859914b 
…ontana-News-Archive into merge/mrandre/update-datetime-fields
@mrandre
Merge pull request #1 from DavidSouther/merge/mrandre/update-datetime…
e5b6b3d 
…-fields

Merge/mrandre/update datetime fields
@gah-boh
Current record will collapse on background click.
46ac7ad
@DavidSouther
Merge pull request #9 from PronghornDigital/collapsing
d66f1c1 
Current record will collapse on background click.
@gah-boh
Adding a new record will set it as current for editing.
c994bea
@DavidSouther
Merge pull request #10 from PronghornDigital/add-new-fix
eb0cc19 
Adding a new record will set it as current for editing.
@gah-boh
Fixing collapse when middle record is selected.
51b54b1
Add icon indicators on right side.
8324a6e
@gah-boh
Tests for archive.collapse
6298aee
@DavidSouther
Remove extension importing mock logger.
7425cfc
@DavidSouther
Merge pull request #13 from DavidSouther/bug/mockLoggerExtension
2c5f271 
Remove extension importing mock logger.
@DavidSouther
Merge pull request #11 from PronghornDigital/collapse-post-fix
72cb7df 
Fixing collapse when middle record is selected.
@DavidSouther
Merge pull request #12 from mrandre/update-datetime-fields
d0c6788 
Make first and last values on record manual. Add icon record indicators. Improve the styling.
@DavidSouther
Gulpfile makes builds *much* faster.
7c68e92
DavidSouther and others added 29 commits April 9, 2016 11:29
@DavidSouther
Merge branch 'master' into bug/scrollToNewRecord
b27cef8
@DavidSouther
Apparently we were not merging dates, because we thought they should …
8c0d4a6 
…be computed at one point.
@stanparker
Merge pull request #105 from DavidSouther/bug/saveDates
ab2174f 
Apparently we were not merging dates, because we thought they should …
@DavidSouther
Consistently enters edit mode when creating a new record.
9262abe
@DavidSouther
Merge branch 'master' into bug/deleteRecord
52ebb35
@DavidSouther
Assume that returned media data is canonical.
191ddc8
@DavidSouther
Update location when saving and when collapsing.
2fc7445
@stanparker
Merge pull request #107 from DavidSouther/bug/changeUrlOnCollapse
6398f9f 
Update location when saving and when collapsing.
@stanparker
Merge pull request #96 from DavidSouther/bug/scrollToNewRecord
5d5c925 
Fix weird behavior on "new" when "editing"
@DavidSouther
Merge branch 'master' into bug/renameMediaOnTapeRename
4eb837c
@DavidSouther
Merge branch 'master' into bug/deleteRecord
63b0cf8
@DavidSouther
Return record data after renaming files, and update in memory record.
7eeff18
@DavidSouther
Turns out, failing to remove an image you want removed is not an exce…
324f7f3 
…ptional case.
@DavidSouther
Merge pull request #103 from DavidSouther/bug/renameMediaOnTapeRename
8bb564d 
Update media links when renaming records.
@DavidSouther
Merge pull request #109 from DavidSouther/bug/removeMissingMediaOnDelete
39f007d 
Turns out, failing to remove an image you want removed is not an exce…
@DavidSouther
Delete records, as per discussion.
a7329ed
@DavidSouther
Actually remove the tape after deleting it.
c7cc9dd
@DavidSouther
Remove the empty directory on delete.
d96f564
Make viewing state for notes
135c68a
@DavidSouther
Merge pull request #112 from PronghornDigital/notesInEdit
661d47e 
Make viewing state for notes
add padding to video player
86a60da
put record medium selector in line
52d70cd
@DavidSouther
Disable [Delete] when the form is not pristine.
4658a5c
@DavidSouther
Do not fail save when data/id dir is not present.
c9e33a5
@stanparker
Merge pull request #110 from DavidSouther/bug/deleteRecord
1510e61 
Bug/delete record
addressed Davids notes
57e73a0
a space
09ffef2
another space
e8be642
@DavidSouther
Merge pull request #113 from PronghornDigital/minorStyleChanges
672c85b 
Minor style changes
@JonathanPorta JonathanPorta merged commit 7d76c0a into JonathanPorta:master Jun 22, 2016
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.
5 participants
@JonathanPorta @DavidSouther @gah-boh @mrandre @stanparker