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

Remkonoteboom/4.5 #495

Merged
merged 66 commits into from
Mar 2, 2016
Merged

Remkonoteboom/4.5 #495

merged 66 commits into from
Mar 2, 2016

Conversation

remkonoteboom
Copy link
Contributor

Updates to discussion widget and other bug fixes.

remkonoteboom and others added 30 commits January 29, 2016 23:20
@remkonoteboom
BRANCH 4.5: updates to discussion widget
75d21dc
@remkonoteboom
BRANCH 4.5: more work on the notes widget
661b415
@remkonoteboom
Merge branch 'remkonoteboom/4.5' of https://github.com/southpawtech/T…
cc13475 
…ACTIC-DEV into remkonoteboom/4.5
@remkonoteboom
BRANCH 4.5: more cleanup of notes
ad3373d
@remkonoteboom
BRANCH 4.5: fixed missing merge conflict
686aa41
@remkonoteboom
BRANCH 4.5: lots of updates, but mostly asset library updates
2088605
@remkonoteboom
BRANCH 4.5: more updates to file browser
bacaf8f
@remkonoteboom
BRANCH 4.5: more updates repo browser
8984d9f
@remkonoteboom
BRANCH 4.5: more tweaks to asset browser
4e9afe6
@remkonoteboom
BRANCH 4.5: more updates to repo browser
4854cc2
@remkonoteboom
Merge branch '4.5' of https://github.com/Southpaw-TACTIC/TACTIC into …
a936aec 
…remkonoteboom/4.5

Conflicts:
	src/tactic/ui/tools/ingest_wdg.py
@remkonoteboom
BRANCH: fixed small merge error
6e784c9
@remkonoteboom
BRANCH 4.5: fixed moving files in file browser
63f54fd
@remkonoteboom
BRANCH 4.5: improved keywords setting when moving folders
31636b4
@remkonoteboom
BRANCH 4.5: more work on repository browser
de6c53e
@remkonoteboom
BRANCH 4.5 more updates to repo browser
23067f3
@remkonoteboom
BRANCH 4.5: more updats to repo browser
0b5627c
@remkonoteboom
BRANCH 4.5: fixed bug when renaming folders that have assets in
c8a9261 
subfolders
@remkonoteboom
BRANCH 4.5: fixed moving files around
2209247
@remkonoteboom
BRANCH 4.5: fixed small order by error
fc64269
@remkonoteboom
BRANCH 4.5: fixed relative dir stored in file when renaming folder
205fcdd
@CeltonMcGrath
REPO BROWSER: reorganized repobrowsercbk
6602740
@remkonoteboom
BRANCH 4.5: added single sobject mode for repo browser
01827cc
@CeltonMcGrath
REPO BROWSER: Added error handling.
18290d6
@CeltonMcGrath
REPO BROWSER: Added proper error handling of delete folder.
7aa53ca
@CeltonMcGrath
Merge remote-tracking branch 'origin/remkonoteboom/4.5' into WORK-260-1
3ec3df5 
Conflicts:
	src/tactic/ui/tools/repo_browser_wdg.py
@CeltonMcGrath
Merge pull request #63 from southpawtech/WORK-260-1
4f75aa1 
Work 260 1
@CeltonMcGrath
REPO BROWSER: Improved JS for renaming folders..
4617d68
@remkonoteboom
BRANCH 4.5: added single asset mode for ingest
0f5e495
@remkonoteboom
BRANCH: 4.5: improved passing snapshots to ingest widget
ee49a0d
remkonoteboom and others added 27 commits February 20, 2016 11:32
@remkonoteboom
Merge branch '4.5' of https://github.com/Southpaw-TACTIC/TACTIC into …
42f4667 
…remkonoteboom/4.5
@remkonoteboom
BRANCH 4.5: made dynamic preview work with table widget
4d789cb
@remkonoteboom
BRANCH 4.5: cleaned up a bunch of dom messiness
b1fd5f7
@remkonoteboom
Merge pull request #64 from southpawtech/WORK-260-1
3dc3aaa 
Work 260 1
@remkonoteboom
Merge branch 'remkonoteboom/4.5' of https://github.com/southpawtech/T…
5f5c096 
…ACTIC-DEV into remkonoteboom/4.5
@remkonoteboom
BRANCH 4.5: minor css changes
04aa384
@remkonoteboom
BRANCH 4.5: cleaned up the pipeline editor a bit
c1927f6
@CeltonMcGrath
REPOBROWSER: Moved path building to os.path commands.
ed44c92
@CeltonMcGrath
REPO BROWSER: Added comments related to parent mode.
4c5329c
@CeltonMcGrath
Added support for single asset mode vs snapshot-parent mode.
ad1b55f
@remkonoteboom
BRANCH 4.5: changed ProdSetting to ProjectSetting ... other minor
2fea116 
updates
@CeltonMcGrath
REPOBROWSER: Added single asset mode.
9a68a7c
@CeltonMcGrath
REPOBROWSER: Added single asset mode.
a7786fc
@CeltonMcGrath
REPOBROWSER: removed print statement.
1004c5b
@CeltonMcGrath
Merge branch 'remkonoteboom/4.5' into WORK-260-1-2
ac42426 
Conflicts:
	src/tactic/ui/tools/repo_browser_wdg.py
@CeltonMcGrath
REPOBROWSER: Removed TODOs
e97e5d8
@CeltonMcGrath
REPOBROWSER: Reincorporated Search object for keyword search.
9c6b765
@CeltonMcGrath
REPOBROWSER: Fixed delete for non single asset mode.
e47b3bc
@CeltonMcGrath
REPOBROWSER: Fixed file moving.
983b7ce
@CeltonMcGrath
REPOBROWSER: Improved delete of item.
6caef82
@CeltonMcGrath
REPOBROWSER: Added TODO's
18732ac
@CeltonMcGrath
REPOBROWSER: Added script on click of tile.
49f7630
@CeltonMcGrath
REPOBROWSER: Updated behavior on drag of a tile.
9e6ceb5
@CeltonMcGrath
REPOBROWSER: Improved renaming.
adb2e09
@CeltonMcGrath
Merge branch 'remkonoteboom/4.5' into WORK-260-1-3
8572986 
Conflicts:
	src/tactic/ui/tools/repo_browser_wdg.py
@remkonoteboom
Merge pull request #66 from southpawtech/WORK-260-1-3
b6e749a 
Repo browser updates
@remkonoteboom
Merge branch 'remkonoteboom/4.5' of https://github.com/southpawtech/T…
740e549 
…ACTIC-DEV into remkonoteboom/4.5
remkonoteboom added a commit that referenced this pull request Mar 2, 2016
@remkonoteboom
Merge pull request #495 from southpawtech/remkonoteboom/4.5
9028912 
Remkonoteboom/4.5
@remkonoteboom remkonoteboom merged commit 9028912 into Southpaw-TACTIC:4.5 Mar 2, 2016
@remkonoteboom
Copy link
Contributor Author

Cumulative updates for 4.5.

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.
2 participants
@remkonoteboom @CeltonMcGrath