summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-05-30Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-30DD-84 : Prompt the user for active listing edits (Cut, Paste and Delete).Merov Linden
2014-05-29DD-84 : WIP : Get DAMA to display for drag and drop. Note that, because of ↵Merov Linden
current SLM issues, it works on version folders, active or not.
2014-05-28DD-84 : WIP : Add confirmation DAMA dialog when moving items in active listingMerov Linden
2014-05-28DD-91 : Fixed! Get each listing to pass through the folder/size check on ↵Merov Linden
validation. Make all messages localizable. General clean up
2014-05-28DD-91 : WIP : Continue refactor of item checking in marketplace and simplify ↵Merov Linden
error messages
2014-05-23DD-91 : WIP : Refactor code testing the validity of a drag, drop or paste of ↵Merov Linden
a folder or item in the marketplace
2014-05-22DD-103 : Use the same logic than Drag and Drop for Paste operations. Prompt ↵Merov Linden
with dialog instead of tooltip though.
2014-05-21DD-91 : WIP : Fix taking the correct root folder (merchant outbox or ↵Merov Linden
marketplace listings) into account
2014-05-21DD-91, DD-84 : WIP : Verify restrictions when moving things to marketplace, ↵Merov Linden
provide clear alert for errors, parametrize alerts and tooltips correctly
2014-05-20DD-88 : Make Drag and Drop tooltips for Merchant Outbox and Marketplace ↵Merov Linden
restrictions identical
2014-05-19increment viewer version to 3.7.9Oz Linden
2014-05-16DD-102 : Fix crash when emptying trash containing nested folders. Also avoid ↵Merov Linden
getting listings several times
2014-05-14DD-76, DD-77, DD-90 : recycled can_move_to_outbox() into ↵Merov Linden
can_move_to_marketplace() so we have now the same logic for both marketplace and merchant outbox
2014-05-14Pull merge from lindenlab/viewer-directdeliveryMerov Linden
2014-05-14DD-95 : Prevent validation to run on folders that are not under the ↵Merov Linden
marketplace root
2014-05-13DD-89 : Separate warnings from infos in the SLM API log. Infos are controled ↵Merov Linden
by a setting. Warning are always logged.
2014-05-12DD-89 : Add a MarketplaceListingsLogging setting to get SLM API logs. DD-22 ↵Merov Linden
: Fixed the delete /listing route
2014-05-12DD-22 : WIP : Implement the GET /listing/:listing route to complete the SLM ↵Merov Linden
API coverage. Will be used only in test.
2014-05-09DD-22 : WIP : Implement deleteSLMListing() to cover the Delete ↵Merov Linden
/listing/:listing_id route. Avoid recursive calls in deleteListing()
2014-05-08DD-22 : WIP : More clean up of marketplace classes, rationalize methods namingMerov Linden
2014-05-09MAINT-3981 FIXED [SECURITY] Notecard being passed around that crashes any V3 ↵AndreyL ProductEngine
based viewer when opened. Correct fix after testing.
2014-05-08DD-22 : WIP : Cleanep up the class definition, seting methods private and ↵Merov Linden
better isolate calls leading to HTTP requests
2014-05-07DD-22 : WIP : Completed the associate_listing route, take edit_url into ↵Merov Linden
account and rewrite getListingURL()
2014-05-07DD-22 : WIP : Partial implementation of PUT associate_listingMerov Linden
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-06DD-22 : WIP : Implement the modify listing route. Made the code more ↵Merov Linden
readable and cleared old debug code
2014-05-06increment viewer version to 3.7.8Oz Linden
2014-05-05DD-22 : WIP : Implement putRaw() on LLHTTPClientMerov Linden
2014-05-05DD-22 : WIP : Completed GET and POST listings routes. Refactored the ↵Merov Linden
marketplace data code a bit as a result
2014-05-05DD-22 : WIP : Clean up use of Json::FastWriter, clean up logging function as ↵Merov Linden
well
2014-05-05DD-22 : WIP : Clean up json code and test Json::WriterMerov Linden
2014-05-02DD-22 : WIP : Post listing using json, get listings using json (parsing ↵Merov Linden
commented out though as too risky and ugly)
2014-05-01DD-81 : Fixed the stock folder count update using an inventory observer. ↵Merov Linden
This observe other changes as well of interest to marketplace and should improve consistency in general
2014-04-29DD-73 : Rewrote the move single item to marketplace code so to support the ↵Merov Linden
required folder structure better
2014-04-29DD-76 : Do not allow Calling Cards in Marketplace ListingsMerov Linden
2014-04-28DD-22 : WIP : Cleaned up error handling in GET merchantMerov Linden
2014-04-28DD-22 : WIP : Implements getSLMListings(). Does no parsing for the momentMerov Linden
2014-04-28DD-22 : WIP : Fix initialization glitch and got rid of old Merchant Outbox ↵Merov Linden
remnants in Marketplace
2014-04-25DD-22 : WIP : Implemented SLM API GET merchant, use it in initialization but ↵Merov Linden
glitch in UI (needs to reopen the floater to see content)
2014-04-25Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-23DD-19 : Revalidate the marketplace when reopening the Audit floaterMerov Linden
2014-04-23DD-19 : Cleaned up Marketplace Audit UI, make the floater non modalMerov Linden
2014-04-22DD-58 : Forced listing ID to be an integer throughout. Verify we get an ↵Merov Linden
integer when using the associate UI.
2014-04-22DD-68 : Suppress the listing if a listing folder is cut when associated but ↵Merov Linden
not listed
2014-04-22DD-68 : Suppress the listing if a listing folder is dragged outside the ↵Merov Linden
marketplace back into the inventory
2014-04-22MergeXiaohong Bao
2014-04-21DD-21 : WIP : Call DirectDelivery cap, nothing done but print out the url in ↵Merov Linden
the log
2014-04-21DD-72 : Fix display of stock number on listing with no associated version folderMerov Linden
2014-04-21Pull and merge DRTVWR-364simon